skip destroyed key versions (#6669)

Co-authored-by: Edward Sun <[email protected]>
GoogleCloudPlatform · Oct 10, 2022 · 416ff2a · 416ff2a
1 parent 6efd53f
commit 416ff2a
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/mmv1/third_party/terraform/utils/kms_utils.go b/mmv1/third_party/terraform/utils/kms_utils.go
@@ -188,15 +188,18 @@ func clearCryptoKeyVersions(cryptoKeyId *kmsCryptoKeyId, userAgent string, confi
 	}
 
 	for _, version := range versionsResponse.CryptoKeyVersions {
-		request := &cloudkms.DestroyCryptoKeyVersionRequest{}
-		destroyCall := versionsClient.Destroy(version.Name, request)
-		if config.UserProjectOverride {
-			destroyCall.Header().Set("X-Goog-User-Project", cryptoKeyId.KeyRingId.Project)
-		}
-		_, err = destroyCall.Do()
-
-		if err != nil {
-			return err
+		// skip the versions that have been destroyed earlier
+		if version.State == "ENABLED" {
+			request := &cloudkms.DestroyCryptoKeyVersionRequest{}
+			destroyCall := versionsClient.Destroy(version.Name, request)
+			if config.UserProjectOverride {
+				destroyCall.Header().Set("X-Goog-User-Project", cryptoKeyId.KeyRingId.Project)
+			}
+			_, err = destroyCall.Do()
+
+			if err != nil {
+				return err
+			}
 		}
 	}