11.14.2

strongdm · Oct 10, 2024 · bc447c2 · bc447c2
1 parent 29048f2
commit bc447c2
Show file tree

Hide file tree

Showing 10 changed files with 88 additions and 42 deletions.
diff --git a/docs/resources/resource.md b/docs/resources/resource.md
@@ -38,6 +38,18 @@ resource "sdm_resource" "postgres-test" {
         }
     }
 }
+
+resource "sdm_resource" "aurora-mysql-test" {
+    aurora_mysql {
+        name = "aurora-mysql-test"
+        hostname = "example.com"
+        database = "my-db"
+        port = 3306
+        secret_store_id = "se-109564346"
+        username = "path/to/credential?key=optionalKeyName"
+        password = "path/to/credential?key=optionalKeyName"
+    }
+}
 ```
 This resource can be imported using the [import](https://www.terraform.io/docs/cli/commands/import.html) command.
 ## Providing Credentials

diff --git a/sdm/data_source_approval_workflow_step_test.go b/sdm/data_source_approval_workflow_step_test.go
@@ -13,17 +13,17 @@ func TestAccSDMApprovalWorkflowStep_Get(t *testing.T) {
 	if err != nil {
 		t.Fatal("failed to create approval workflow step: ", err)
 	}
-	flowId := step.ApprovalFlowID
+	flowID := step.ApprovalFlowID
 
 	dsName := randomWithPrefix("af-test-query")
 	resource.Test(t, resource.TestCase{
 		Providers:    testAccProviders,
 		CheckDestroy: testCheckDestroy,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccSDMApprovalWorkflowStepDataSourceGetFilterConfig(dsName, flowId),
+				Config: testAccSDMApprovalWorkflowStepDataSourceGetFilterConfig(dsName, flowID),
 				Check: resource.ComposeTestCheckFunc(
-					resource.TestCheckResourceAttr("data.sdm_approval_workflow_step."+dsName, "approval_workflow_steps.0.approval_flow_id", flowId),
+					resource.TestCheckResourceAttr("data.sdm_approval_workflow_step."+dsName, "approval_workflow_steps.0.approval_flow_id", flowID),
 					resource.TestCheckResourceAttr("data.sdm_approval_workflow_step."+dsName, "approval_workflow_steps.#", "1"),
 				),
 			},
@@ -56,9 +56,9 @@ func TestAccSDMApprovalWorkflowStep_GetNone(t *testing.T) {
 	})
 }
 
-func testAccSDMApprovalWorkflowStepDataSourceGetFilterConfig(stepSourceName, flowId string) string {
+func testAccSDMApprovalWorkflowStepDataSourceGetFilterConfig(stepSourceName, flowID string) string {
 	return fmt.Sprintf(`
 	data "sdm_approval_workflow_step" "%s" {
 		approval_flow_id = "%s"
-	}`, stepSourceName, flowId)
+	}`, stepSourceName, flowID)
 }
diff --git a/sdm/internal/sdk/client.go b/sdm/internal/sdk/client.go
diff --git a/sdm/internal/sdk/models.go b/sdm/internal/sdk/models.go
diff --git a/sdm/internal/sdk/plumbing.go b/sdm/internal/sdk/plumbing.go
diff --git a/sdm/internal/sdk/v1/queries.pb.go b/sdm/internal/sdk/v1/queries.pb.go
diff --git a/sdm/provider.go b/sdm/provider.go
diff --git a/sdm/resource_account_test.go b/sdm/resource_account_test.go
@@ -339,7 +339,7 @@ func testAccSDMAccountUserConfig(resourceName, firstName, lastName, email string
 	`, resourceName, firstName, lastName, email)
 }
 
-func testAccSDMAccountUserPermissionLevelConfig(resourceName, firstName, lastName, email, permission_level string) string {
+func testAccSDMAccountUserPermissionLevelConfig(resourceName, firstName, lastName, email, permissionLevel string) string {
 
 	return fmt.Sprintf(`
 	resource "sdm_account" "%s" {
@@ -350,7 +350,7 @@ func testAccSDMAccountUserPermissionLevelConfig(resourceName, firstName, lastNam
 			permission_level = "%s"
 		}
 	}
-	`, resourceName, firstName, lastName, email, permission_level)
+	`, resourceName, firstName, lastName, email, permissionLevel)
 }
 
 func testAccSDMAccountServiceConfig(resourceName, serviceName string) string {

diff --git a/sdm/resource_approval_workflow_approver_test.go b/sdm/resource_approval_workflow_approver_test.go
@@ -232,7 +232,7 @@ func createApprovalWorkflowApproversWithPrifix(prefix string, count int) ([]*sdm
 	}
 	step := createResp.ApprovalWorkflowStep
 
-	approval_workflow_approvers := []*sdm.ApprovalWorkflowApprover{}
+	approvalWorkflowApprovers := []*sdm.ApprovalWorkflowApprover{}
 	for i := 0; i < count; i++ {
 		createResp, err := client.ApprovalWorkflowApprovers().Create(ctx, &sdm.ApprovalWorkflowApprover{
 			ApprovalFlowID: workflows[0].ID,
@@ -242,9 +242,9 @@ func createApprovalWorkflowApproversWithPrifix(prefix string, count int) ([]*sdm
 		if err != nil {
 			return nil, fmt.Errorf("failed to create approval workflow approver: %w", err)
 		}
-		approval_workflow_approvers = append(approval_workflow_approvers, createResp.ApprovalWorkflowApprover)
+		approvalWorkflowApprovers = append(approvalWorkflowApprovers, createResp.ApprovalWorkflowApprover)
 	}
-	return approval_workflow_approvers, nil
+	return approvalWorkflowApprovers, nil
 }
 
 func testAccSDMApprovalWorkflowApproverConfig(workflowResourceName, workflowName, stepResourceName, accountName, roleName, approver1Name, approver2Name string) string {

diff --git a/sdm/resource_approval_workflow_test.go b/sdm/resource_approval_workflow_test.go
@@ -109,7 +109,7 @@ func createApprovalWorkflowsWithPrifix(prefix, approvalMode string, count int) (
 	}
 	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
 	defer cancel()
-	approval_workflows := []*sdm.ApprovalWorkflow{}
+	approvalWorkflows := []*sdm.ApprovalWorkflow{}
 	for i := 0; i < count; i++ {
 		createResp, err := client.ApprovalWorkflows().Create(ctx, &sdm.ApprovalWorkflow{
 			Name:         randomWithPrefix(prefix),
@@ -118,9 +118,9 @@ func createApprovalWorkflowsWithPrifix(prefix, approvalMode string, count int) (
 		if err != nil {
 			return nil, fmt.Errorf("failed to create approval_workflow: %w", err)
 		}
-		approval_workflows = append(approval_workflows, createResp.ApprovalWorkflow)
+		approvalWorkflows = append(approvalWorkflows, createResp.ApprovalWorkflow)
 	}
-	return approval_workflows, nil
+	return approvalWorkflows, nil
 }
 
 func testAccSDMApprovalWorkflowConfig(resourceName, workflowName string) string {