Skip to content

Commit b191cd4

Browse files
committed
[pkg/amd/psb] Satisfy the linter
Signed-off-by: Dmitrii Okunev <xaionaro@meta.com>
1 parent f99c6ac commit b191cd4

2 files changed

Lines changed: 9 additions & 3 deletions

File tree

pkg/amd/psb/keys_test.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@ func (suite *KeySuite) TestKeySetAddKey() {
5050
assert.NoError(suite.T(), err)
5151

5252
keySet := NewKeySet()
53-
keySet.AddKey(rootKey, AMDRootKey)
53+
err = keySet.AddKey(rootKey, AMDRootKey)
54+
assert.NoError(suite.T(), err)
5455

5556
assert.Equal(suite.T(), 1, len(keySet.AllKeyIDs()))
5657
assert.NotNil(suite.T(), keySet.GetKey(KeyID(rootKeyID)))
@@ -85,7 +86,8 @@ func (suite *KeySuite) TestOEMKeyFields() {
8586

8687
// parse root key and use it to validate token key
8788
keySet := NewKeySet()
88-
keySet.AddKey(rootKey, AMDRootKey)
89+
err = keySet.AddKey(rootKey, AMDRootKey)
90+
assert.NoError(suite.T(), err)
8991

9092
key, err := NewTokenKey(bytes.NewBuffer(oemSigningKey), keySet)
9193
assert.NoError(suite.T(), err)

pkg/amd/psb/keyset.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,11 @@ func (kdb KeySet) KeysetFromType(keyType KeyType) (KeySet, error) {
9595
if key == nil {
9696
return NewKeySet(), newErrInvalidFormat(fmt.Errorf("KeySet in inconsistent state, no key is present with keyID %s", keyID.Hex()))
9797
}
98-
keySet.AddKey(key, keyType)
98+
99+
err := keySet.AddKey(key, keyType)
100+
if err != nil {
101+
return NewKeySet(), fmt.Errorf("unable to add key %s: %w", keyID, err)
102+
}
99103
}
100104
return keySet, nil
101105
}

0 commit comments

Comments
 (0)