From 2a5636fa4efc849121109e17c88639f6c5ea4966 Mon Sep 17 00:00:00 2001 From: Ian Mckay Date: Thu, 7 Mar 2024 08:26:51 +1100 Subject: [PATCH] bugfix: Adjust error comparison in builtin stores (#975) --- platform/blueprint/builtin/db.go | 2 +- platform/device/builtin/db.go | 2 +- platform/user/builtin/db.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/platform/blueprint/builtin/db.go b/platform/blueprint/builtin/db.go index 9edd54ed..b8427c67 100644 --- a/platform/blueprint/builtin/db.go +++ b/platform/blueprint/builtin/db.go @@ -125,7 +125,7 @@ func (db *DB) BlueprintByName(name string) (*blueprint.Blueprint, error) { return ¬Found{"Blueprint", fmt.Sprintf("name %s", name)} } v := b.Get(idx) - if idx == nil { + if v == nil { return ¬Found{"Blueprint", fmt.Sprintf("uuid %s", string(idx))} } return blueprint.UnmarshalBlueprint(v, &bp) diff --git a/platform/device/builtin/db.go b/platform/device/builtin/db.go index 2099a2c1..049e3ac4 100644 --- a/platform/device/builtin/db.go +++ b/platform/device/builtin/db.go @@ -185,7 +185,7 @@ func (db *DB) deviceByIndex(key string) (*device.Device, error) { return ¬Found{"Device", fmt.Sprintf("key %s", key)} } v := b.Get(idx) - if idx == nil { + if v == nil { return ¬Found{"Device", fmt.Sprintf("uuid %s", string(idx))} } return device.UnmarshalDevice(v, &dev) diff --git a/platform/user/builtin/db.go b/platform/user/builtin/db.go index 49ab6e25..d6d90ced 100644 --- a/platform/user/builtin/db.go +++ b/platform/user/builtin/db.go @@ -122,7 +122,7 @@ func (db *DB) UserByUserID(userID string) (*user.User, error) { return ¬Found{"User", fmt.Sprintf("user id %s", userID)} } v := b.Get(idx) - if idx == nil { + if v == nil { return ¬Found{"User", fmt.Sprintf("uuid %s", string(idx))} } return user.UnmarshalUser(v, &u)