fix enablekeyversionhandler and tests

Author: Benjosh95

services/kms/wait/wait.go

@@ -129,12 +129,14 @@ func EnableKeyVersionWaitHandler(ctx context.Context, client ApiKmsClient, proje
 
 		if response != nil && response.State != nil {
 			switch *response.State {
-			case kms.VERSIONSTATE_DESTROYED, kms.VERSIONSTATE_KEY_MATERIAL_INVALID, kms.VERSIONSTATE_DISABLED:
+			case kms.VERSIONSTATE_ACTIVE:
 				return true, response, nil
-			case kms.VERSIONSTATE_CREATING:
+			case kms.VERSIONSTATE_DISABLED, kms.VERSIONSTATE_CREATING, kms.VERSIONSTATE_KEY_MATERIAL_UNAVAILABLE:
 				return false, nil, nil
+			case kms.VERSIONSTATE_DESTROYED, kms.VERSIONSTATE_KEY_MATERIAL_INVALID:
+				return true, response, fmt.Errorf("enabling failed for key %s version %d: state %s", keyId, version, *response.State)
 			default:
-				return true, response, nil
+				return true, response, fmt.Errorf("key version %d for key %s has unexpected state %s", version, keyId, *response.State)
 			}
 		}
 

services/kms/wait/wait_test.go

@@ -409,15 +409,15 @@ func TestEnableKeyVersionWaitHandler(t *testing.T) {
 			false,
 		},
 		{
-			"create failed delayed",
+			"create failed with invalid key material",
 			[]versionResponse{
 				{fixtureVersion(1, false, kms.VERSIONSTATE_CREATING), nil},
 				{fixtureVersion(1, false, kms.VERSIONSTATE_CREATING), nil},
 				{fixtureVersion(1, false, kms.VERSIONSTATE_CREATING), nil},
 				{fixtureVersion(1, false, kms.VERSIONSTATE_KEY_MATERIAL_INVALID), nil},
 			},
 			fixtureVersion(1, false, kms.VERSIONSTATE_KEY_MATERIAL_INVALID),
-			false,
+			true,
 		},
 		{
 			"timeout",
@@ -433,6 +433,24 @@ func TestEnableKeyVersionWaitHandler(t *testing.T) {
 				{fixtureVersion(1, false, "bogus"), nil},
 			},
 			fixtureVersion(1, false, "bogus"),
+			true,
+		},
+		{
+			"version destroyed",
+			[]versionResponse{
+				{fixtureVersion(1, false, kms.VERSIONSTATE_DESTROYED), nil},
+			},
+			fixtureVersion(1, false, kms.VERSIONSTATE_DESTROYED),
+			true,
+		},
+		{
+			"version disabled - continues waiting",
+			[]versionResponse{
+				{fixtureVersion(1, true, kms.VERSIONSTATE_DISABLED), nil},
+				{fixtureVersion(1, true, kms.VERSIONSTATE_DISABLED), nil},
+				{fixtureVersion(1, false, kms.VERSIONSTATE_ACTIVE), nil},
+			},
+			fixtureVersion(1, false, kms.VERSIONSTATE_ACTIVE),
 			false,
 		},
 		{