Merge pull request #135 from okta/ulfat/renameUAMDisplayNameToSudoDisplayName

Fix args type bug

Author: UlfatSayyed-okta

go.mod

@@ -12,7 +12,6 @@ require (
 	github.com/hashicorp/terraform-plugin-docs v0.8.1
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.30.0
 	github.com/kylelemons/godebug v1.1.0
-	github.com/mitchellh/mapstructure v1.5.0
 	github.com/tomnomnom/linkheader v0.0.0-20180905144013-02ca5825eb80
 	gopkg.in/square/go-jose.v2 v2.6.0
 )
@@ -55,6 +54,7 @@ require (
 	github.com/mitchellh/copystructure v1.2.0 // indirect
 	github.com/mitchellh/go-testing-interface v1.14.1 // indirect
 	github.com/mitchellh/go-wordwrap v1.0.1 // indirect
+	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
 	github.com/oklog/run v1.0.0 // indirect
 	github.com/opentracing/opentracing-go v1.2.0 // indirect

oktapam/resource_sudo_command_bundle.go

@@ -7,13 +7,25 @@ import (
 	"github.com/atko-pam/pam-sdk-go/client/pam"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"github.com/mitchellh/mapstructure"
 	"github.com/okta/terraform-provider-oktapam/oktapam/client"
 	"github.com/okta/terraform-provider-oktapam/oktapam/client/wrappers"
 	"github.com/okta/terraform-provider-oktapam/oktapam/constants/attributes"
 	"github.com/okta/terraform-provider-oktapam/oktapam/constants/descriptions"
+	"github.com/okta/terraform-provider-oktapam/oktapam/utils"
 )
 
+var commandTypeMap = map[string]pam.CommandType{
+	"raw":        pam.CommandType_RAW,
+	"executable": pam.CommandType_EXECUTABLE,
+	"directory":  pam.CommandType_DIRECTORY,
+}
+
+var argsTypeMap = map[string]pam.ArgsType{
+	"custom": pam.ArgsType_CUSTOM,
+	"any":    pam.ArgsType_ANY,
+	"none":   pam.ArgsType_NONE,
+}
+
 func resourceSudoCommandBundle() *schema.Resource {
 	return &schema.Resource{
 		Description:   descriptions.ResourceSudoCommandsBundle,
@@ -122,36 +134,60 @@ func readSudoCommandBundleFromResource(d *schema.ResourceData) (*pam.SudoCommand
 	var diags diag.Diagnostics
 	var structuredCommands []pam.SudoCommandBundleStructuredCommandsInner
 	if scs, ok := d.GetOk(attributes.StructuredCommands); ok {
-		structuredCommandResources, ok := scs.([]interface{})
+		structuredCommandResources, ok := scs.([]any)
 		if !ok {
 			diags = append(diags, diag.Diagnostic{
 				Severity: diag.Error,
 				Summary:  fmt.Sprintf("%s is invalid", attributes.StructuredCommands),
 			})
 		}
-		for _, sc := range structuredCommandResources {
-			var structuredCommandResource pam.SudoCommandBundleStructuredCommandsInner
-			cfg := &mapstructure.DecoderConfig{
-				Metadata: nil,
-				Result:   &structuredCommandResource,
-				TagName:  "json",
+		for _, scI := range structuredCommandResources {
+			sc, ok := scI.(map[string]any)
+			if !ok {
+				diags = append(diags, diag.Diagnostic{
+					Severity: diag.Error,
+					Summary:  fmt.Sprintf("%s is invalid", attributes.StructuredCommands),
+				})
 			}
-			decoder, dErr := mapstructure.NewDecoder(cfg)
-			if dErr != nil {
+
+			command, ok := sc[attributes.StructuredCommand].(string)
+			if !ok {
 				diags = append(diags, diag.Diagnostic{
 					Severity: diag.Error,
-					Summary:  fmt.Sprintf("error creating decoder for %s", attributes.StructuredCommands),
+					Summary:  fmt.Sprintf("%s is invalid", attributes.StructuredCommand),
 				})
-				continue
 			}
-			if dErr := decoder.Decode(sc); dErr != nil {
+
+			structuredCommand := pam.SudoCommandBundleStructuredCommandsInner{
+				Command: command,
+			}
+
+			commandTypeStr, ok := sc[attributes.StructuredCommandType].(string)
+			if !ok {
 				diags = append(diags, diag.Diagnostic{
 					Severity: diag.Error,
-					Summary:  fmt.Sprintf("error decoding for %s", attributes.StructuredCommands),
+					Summary:  fmt.Sprintf("%s is invalid", attributes.StructuredCommandType),
 				})
-				continue
 			}
-			structuredCommands = append(structuredCommands, structuredCommandResource)
+
+			structuredCommand.CommandType = commandTypeMap[commandTypeStr]
+
+			if args, ok := sc[attributes.StructuredCommandArgs].(string); ok {
+				structuredCommand.Args = utils.AsStringPtrZero(args, false)
+			}
+
+			argsTypeStr, ok := sc[attributes.StructuredCommandArgsType].(string)
+			if !ok {
+				diags = append(diags, diag.Diagnostic{
+					Severity: diag.Error,
+					Summary:  fmt.Sprintf("%s is invalid", attributes.StructuredCommandArgsType),
+				})
+			}
+
+			argsType := argsTypeMap[argsTypeStr]
+			structuredCommand.ArgsType = &argsType
+
+			structuredCommands = append(structuredCommands, structuredCommand)
 		}
 	}
 

oktapam/resource_sudo_command_bundle_test.go

@@ -31,13 +31,31 @@ func TestAccResourceSudoCommandBundle(t *testing.T) {
 				),
 			},
 			{
-				Config: createTestAccSudoCommandBundleUpdateConfig(sudoCommandBundleName),
+				Config: createTestAccSudoCommandBundleUpdateConfigWithoutArgs(sudoCommandBundleName, "/bin/", "directory"),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr(resourceName, attributes.Name, sudoCommandBundleName),
 					resource.TestCheckResourceAttr(resourceName, fmt.Sprintf("%s.0.%s", attributes.StructuredCommands, attributes.StructuredCommandType), "directory"),
 					resource.TestCheckResourceAttr(resourceName, fmt.Sprintf("%s.0.%s", attributes.StructuredCommands, attributes.StructuredCommand), "/bin/"),
 				),
 			},
+			{
+				Config: createTestAccSudoCommandBundleUpdateConfigWithoutArgs(sudoCommandBundleName, "/bin/ls", "raw"),
+				Check: resource.ComposeAggregateTestCheckFunc(
+					resource.TestCheckResourceAttr(resourceName, attributes.Name, sudoCommandBundleName),
+					resource.TestCheckResourceAttr(resourceName, fmt.Sprintf("%s.0.%s", attributes.StructuredCommands, attributes.StructuredCommandType), "raw"),
+					resource.TestCheckResourceAttr(resourceName, fmt.Sprintf("%s.0.%s", attributes.StructuredCommands, attributes.StructuredCommand), "/bin/ls"),
+				),
+			},
+			{
+				Config: createTestAccSudoCommandBundleUpdateConfigWithArgs(sudoCommandBundleName, "/bin/touch", "executable", "custom", "test.txt"),
+				Check: resource.ComposeAggregateTestCheckFunc(
+					resource.TestCheckResourceAttr(resourceName, attributes.Name, sudoCommandBundleName),
+					resource.TestCheckResourceAttr(resourceName, fmt.Sprintf("%s.0.%s", attributes.StructuredCommands, attributes.StructuredCommandType), "executable"),
+					resource.TestCheckResourceAttr(resourceName, fmt.Sprintf("%s.0.%s", attributes.StructuredCommands, attributes.StructuredCommand), "/bin/touch"),
+					resource.TestCheckResourceAttr(resourceName, fmt.Sprintf("%s.0.%s", attributes.StructuredCommands, attributes.StructuredCommandArgsType), "custom"),
+					resource.TestCheckResourceAttr(resourceName, fmt.Sprintf("%s.0.%s", attributes.StructuredCommands, attributes.StructuredCommandArgs), "test.txt"),
+				),
+			},
 		},
 	})
 }
@@ -56,23 +74,37 @@ func createTestAccSudoCommandBundleCreateConfig(name string) string {
 		structured_commands {
 			command       = "/bin/run.sh"
 			command_type  = "executable"
-			args_type     = "custom"
-			args          = "ls"
+			args_type     = "any"
   		}
 	}
 	`
 	return fmt.Sprintf(format, name)
 }
 
-func createTestAccSudoCommandBundleUpdateConfig(name string) string {
+func createTestAccSudoCommandBundleUpdateConfigWithArgs(name, command, commandType, argsType, args string) string {
 	const format = `
 	resource "oktapam_sudo_command_bundle" "test_acc_sudo_command_bundle" {
 		name = "%s"
 		structured_commands {
-			command       = "/bin/"
-			command_type  = "directory"
+			command       = "%s"
+			command_type  = "%s"
+			args_type     = "%s"
+			args     = "%s"
   		}
 	}
 	`
-	return fmt.Sprintf(format, name)
+	return fmt.Sprintf(format, name, command, commandType, argsType, args)
+}
+
+func createTestAccSudoCommandBundleUpdateConfigWithoutArgs(name, command, commandType string) string {
+	const format = `
+	resource "oktapam_sudo_command_bundle" "test_acc_sudo_command_bundle" {
+		name = "%s"
+		structured_commands {
+			command       = "%s"
+			command_type  = "%s"
+  		}
+	}
+	`
+	return fmt.Sprintf(format, name, command, commandType)
 }