fix

hashicorp · Sep 25, 2023 · 3d137e5 · 3d137e5
1 parent 031d629
commit 3d137e5
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 24 deletions.
diff --git a/internal/services/resource/resource_deployment_script_azure_cli_resource.go b/internal/services/resource/resource_deployment_script_azure_cli_resource.go
@@ -36,7 +36,7 @@ func (r ResourceDeploymentScriptAzureCliResource) IDValidationFunc() pluginsdk.S
 }
 
 func (r ResourceDeploymentScriptAzureCliResource) Arguments() map[string]*pluginsdk.Schema {
-	return getDeploymentScriptArguments(AzureCliKind)
+	return getDeploymentScriptArguments()
 }
 
 func (r ResourceDeploymentScriptAzureCliResource) Attributes() map[string]*pluginsdk.Schema {

diff --git a/internal/services/resource/resource_deployment_script_azure_power_shell_resource.go b/internal/services/resource/resource_deployment_script_azure_power_shell_resource.go
@@ -36,7 +36,7 @@ func (r ResourceDeploymentScriptAzurePowerShellResource) IDValidationFunc() plug
 }
 
 func (r ResourceDeploymentScriptAzurePowerShellResource) Arguments() map[string]*pluginsdk.Schema {
-	return getDeploymentScriptArguments(AzurePowerShellKind)
+	return getDeploymentScriptArguments()
 }
 
 func (r ResourceDeploymentScriptAzurePowerShellResource) Attributes() map[string]*pluginsdk.Schema {

diff --git a/internal/services/resource/resource_deployment_script_common.go b/internal/services/resource/resource_deployment_script_common.go
@@ -21,11 +21,6 @@ import (
 
 type DeploymentScriptKind string
 
-const (
-	AzurePowerShellKind DeploymentScriptKind = "AzurePowerShell"
-	AzureCliKind        DeploymentScriptKind = "AzureCli"
-)
-
 type ResourceDeploymentScriptModel struct {
 	Name                   string                             `tfschema:"name"`
 	ResourceGroupName      string                             `tfschema:"resource_group_name"`
@@ -65,7 +60,7 @@ type ResourceDeploymentScriptPatchModel struct {
 	Tags map[string]string `tfschema:"tags"`
 }
 
-func getDeploymentScriptArguments(kind DeploymentScriptKind) map[string]*pluginsdk.Schema {
+func getDeploymentScriptArguments() map[string]*pluginsdk.Schema {
 	result := map[string]*pluginsdk.Schema{
 		"name": {
 			Type:     pluginsdk.TypeString,
@@ -88,6 +83,13 @@ func getDeploymentScriptArguments(kind DeploymentScriptKind) map[string]*plugins
 			ValidateFunc: validate.ISO8601DurationBetween("PT1H", "P1DT2H"),
 		},
 
+		"version": {
+			Type:         pluginsdk.TypeString,
+			Required:     true,
+			ForceNew:     true,
+			ValidateFunc: validation.StringIsNotEmpty,
+		},
+
 		"command_line": {
 			Type:         pluginsdk.TypeString,
 			Optional:     true,
@@ -220,22 +222,6 @@ func getDeploymentScriptArguments(kind DeploymentScriptKind) map[string]*plugins
 		"tags": commonschema.Tags(),
 	}
 
-	if kind == AzurePowerShellKind {
-		result["version"] = &pluginsdk.Schema{
-			Type:         pluginsdk.TypeString,
-			Required:     true,
-			ForceNew:     true,
-			ValidateFunc: validation.StringIsNotEmpty,
-		}
-	} else {
-		result["version"] = &pluginsdk.Schema{
-			Type:         pluginsdk.TypeString,
-			Required:     true,
-			ForceNew:     true,
-			ValidateFunc: validation.StringIsNotEmpty,
-		}
-	}
-
 	return result
 }