feat(secrets-manager): add KMS key options to create and update instance tests

Author: s-inter

internal/cmd/secrets-manager/instance/create/create_test.go

@@ -25,6 +25,13 @@ var testClient = &secretsmanager.APIClient{}
 var testProjectId = uuid.NewString()
 var testInstanceId = uuid.NewString()
 
+const (
+	testKmsKeyId               = "key-id"
+	testKmsKeyringId           = "keyring-id"
+	testKmsKeyVersion          = int64(1)
+	testKmsServiceAccountEmail = "my-service-account-1234567@sa.stackit.cloud"
+)
+
 func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]string {
 	flagValues := map[string]string{
 		projectIdFlag:    testProjectId,
@@ -162,6 +169,24 @@ func TestParseInput(t *testing.T) {
 				*model.Acls = append(*model.Acls, "1.2.3.4/32")
 			}),
 		},
+		{
+			description: "kms flags",
+			flagValues: fixtureFlagValues(func(flagValues map[string]string) {
+				delete(flagValues, aclFlag)
+				flagValues[kmsKeyIdFlag] = testKmsKeyId
+				flagValues[kmsKeyringIdFlag] = testKmsKeyringId
+				flagValues[kmsKeyVersionFlag] = "1"
+				flagValues[kmsServiceAccountEmailFlag] = testKmsServiceAccountEmail
+			}),
+			isValid: true,
+			expectedModel: fixtureInputModel(func(model *inputModel) {
+				model.Acls = nil
+				model.KmsKeyId = utils.Ptr(testKmsKeyId)
+				model.KmsKeyringId = utils.Ptr(testKmsKeyringId)
+				model.KmsKeyVersion = utils.Ptr(testKmsKeyVersion)
+				model.KmsServiceAccountEmail = utils.Ptr(testKmsServiceAccountEmail)
+			}),
+		},
 		{
 			description: "project id missing",
 			flagValues: fixtureFlagValues(func(flagValues map[string]string) {
@@ -205,6 +230,28 @@ func TestBuildCreateInstanceRequest(t *testing.T) {
 			model:           fixtureInputModel(),
 			expectedRequest: fixtureRequest(),
 		},
+		{
+			description: "with kms",
+			model: fixtureInputModel(func(model *inputModel) {
+				model.Acls = nil
+				model.KmsKeyId = utils.Ptr(testKmsKeyId)
+				model.KmsKeyringId = utils.Ptr(testKmsKeyringId)
+				model.KmsKeyVersion = utils.Ptr(testKmsKeyVersion)
+				model.KmsServiceAccountEmail = utils.Ptr(testKmsServiceAccountEmail)
+			}),
+			expectedRequest: fixtureRequest(func(request *secretsmanager.ApiCreateInstanceRequest) {
+				payload := secretsmanager.CreateInstancePayload{
+					Name: utils.Ptr("example"),
+					KmsKey: &secretsmanager.KmsKeyPayload{
+						KeyId:               utils.Ptr(testKmsKeyId),
+						KeyRingId:           utils.Ptr(testKmsKeyringId),
+						KeyVersion:          utils.Ptr(testKmsKeyVersion),
+						ServiceAccountEmail: utils.Ptr(testKmsServiceAccountEmail),
+					},
+				}
+				*request = (*request).CreateInstancePayload(payload)
+			}),
+		},
 	}
 
 	for _, tt := range tests {

internal/cmd/secrets-manager/instance/update/update_test.go

@@ -31,6 +31,13 @@ var (
 	testInstanceId = uuid.NewString()
 )
 
+const (
+	testKmsKeyId               = "key-id"
+	testKmsKeyringId           = "keyring-id"
+	testKmsKeyVersion          = int64(1)
+	testKmsServiceAccountEmail = "my-service-account-1234567@sa.stackit.cloud"
+)
+
 func fixtureArgValues(mods ...func(argValues []string)) []string {
 	argValues := []string{
 		testInstanceId,
@@ -80,6 +87,23 @@ func fixtureRequest(mods ...func(request *secretsmanager.ApiUpdateACLsRequest))
 	return request
 }
 
+func fixtureUpdateInstanceRequest(mods ...func(request *secretsmanager.ApiUpdateInstanceRequest)) secretsmanager.ApiUpdateInstanceRequest {
+	request := testClient.UpdateInstance(testCtx, testProjectId, testInstanceId)
+	request = request.UpdateInstancePayload(secretsmanager.UpdateInstancePayload{
+		KmsKey: &secretsmanager.KmsKeyPayload{
+			KeyId:               utils.Ptr(testKmsKeyId),
+			KeyRingId:           utils.Ptr(testKmsKeyringId),
+			KeyVersion:          utils.Ptr(testKmsKeyVersion),
+			ServiceAccountEmail: utils.Ptr(testKmsServiceAccountEmail),
+		},
+	})
+
+	for _, mod := range mods {
+		mod(&request)
+	}
+	return request
+}
+
 func TestParseInput(t *testing.T) {
 	tests := []struct {
 		description   string
@@ -209,6 +233,25 @@ func TestParseInput(t *testing.T) {
 				)
 			}),
 		},
+		{
+			description: "kms flags",
+			argValues:   fixtureArgValues(),
+			flagValues: map[string]string{
+				projectIdFlag:              testProjectId,
+				kmsKeyIdFlag:               testKmsKeyId,
+				kmsKeyringIdFlag:           testKmsKeyringId,
+				kmsKeyVersionFlag:          "1",
+				kmsServiceAccountEmailFlag: testKmsServiceAccountEmail,
+			},
+			isValid: true,
+			expectedModel: fixtureInputModel(func(model *inputModel) {
+				model.Acls = nil
+				model.KmsKeyId = utils.Ptr(testKmsKeyId)
+				model.KmsKeyringId = utils.Ptr(testKmsKeyringId)
+				model.KmsKeyVersion = utils.Ptr(testKmsKeyVersion)
+				model.KmsServiceAccountEmail = utils.Ptr(testKmsServiceAccountEmail)
+			}),
+		},
 	}
 
 	for _, tt := range tests {
@@ -246,8 +289,12 @@ func TestBuildRequest(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.description, func(t *testing.T) {
 			request := buildRequest(testCtx, tt.model, testClient)
+			aclRequest, ok := request.(secretsmanager.ApiUpdateACLsRequest)
+			if !ok {
+				t.Fatalf("expected ACL update request, got %T", request)
+			}
 
-			diff := cmp.Diff(request, tt.expectedRequest,
+			diff := cmp.Diff(aclRequest, tt.expectedRequest,
 				cmp.AllowUnexported(tt.expectedRequest),
 				cmpopts.EquateComparable(testCtx),
 			)
@@ -257,3 +304,28 @@ func TestBuildRequest(t *testing.T) {
 		})
 	}
 }
+
+func TestBuildRequestKms(t *testing.T) {
+	model := fixtureInputModel(func(model *inputModel) {
+		model.Acls = nil
+		model.KmsKeyId = utils.Ptr(testKmsKeyId)
+		model.KmsKeyringId = utils.Ptr(testKmsKeyringId)
+		model.KmsKeyVersion = utils.Ptr(testKmsKeyVersion)
+		model.KmsServiceAccountEmail = utils.Ptr(testKmsServiceAccountEmail)
+	})
+
+	request := buildRequest(testCtx, model, testClient)
+	updateRequest, ok := request.(secretsmanager.ApiUpdateInstanceRequest)
+	if !ok {
+		t.Fatalf("expected instance update request, got %T", request)
+	}
+
+	expectedRequest := fixtureUpdateInstanceRequest()
+	diff := cmp.Diff(updateRequest, expectedRequest,
+		cmp.AllowUnexported(expectedRequest),
+		cmpopts.EquateComparable(testCtx),
+	)
+	if diff != "" {
+		t.Fatalf("Data does not match: %s", diff)
+	}
+}