Fix-383 destroyed key gcp (#384)

* fix-383 destroyed key gcp - only fetch pk for enabled version * remove unreachable code
ecadlabs · Jul 3, 2023 · 7d22b8d · 7d22b8d
1 parent 397faf9
commit 7d22b8d
Showing 1 changed file with 8 additions and 11 deletions.
diff --git a/pkg/vault/cloudkms/cloudkms.go b/pkg/vault/cloudkms/cloudkms.go
@@ -131,19 +131,16 @@ func (c *cloudKMSIterator) Next() (vault.StoredKey, error) {
 			// get key versions
 			c.verIter = c.vault.client.ListCryptoKeyVersions(c.ctx, &kmspb.ListCryptoKeyVersionsRequest{Parent: key.Name})
 		} else {
-			pub, err := c.vault.getPublicKey(c.ctx, ver.Name)
-			if err != nil {
-				return nil, fmt.Errorf("(CloudKMS/%s) getPublicKey: %w", c.vault.config.keyRingName(), err)
-			}
-			if err != nil {
-				if err != crypt.ErrUnsupportedKeyType {
+			if ver.State == kmspb.CryptoKeyVersion_ENABLED {
+				pub, err := c.vault.getPublicKey(c.ctx, ver.Name)
+				if err != nil {
 					return nil, fmt.Errorf("(CloudKMS/%s) getPublicKey: %w", c.vault.config.keyRingName(), err)
+				} else {
+					return &cloudKMSKey{
+						key: ver,
+						pub: pub,
+					}, nil
 				}
-			} else {
-				return &cloudKMSKey{
-					key: ver,
-					pub: pub,
-				}, nil
 			}
 		}
 	}