feat(script): allow user-defined encoding_type in script creation, default to Base64 in Terraform schema

Author: ZStack-Robot

docs/resources/script.md

@@ -22,6 +22,7 @@ resource "zstack_script" "example" {
   platform       = "Linux"
   script_type    = "Shell"
   script_timeout = 50
+  encoding_type  = "Base64"
 }
 
 
@@ -35,6 +36,7 @@ output "zstack_script_out" {
 
 ### Required
 
+- `encoding_type` (String) The encoding type of the script content. Supports: Base64, PlainText.
 - `name` (String) The name of the script.
 - `script_content` (String) The content of the script.
 - `script_type` (String) The type of the script (e.g., 'Shell', 'Python', 'PowerShell').

examples/resources/script/resource.tf

@@ -8,6 +8,7 @@ resource "zstack_script" "example" {
   platform       = "Linux"
   script_type    = "Shell"
   script_timeout = 50
+  encoding_type  = "Base64"
 }
 
 

zstack-sdk-go/pkg/param/vm_instance_script_params.go

@@ -17,6 +17,7 @@ type CreateVmInstanceScriptDetailParam struct {
 	Name          string   `json:"name"`
 	Description   string   `json:"description"`            // 描述
 	ScriptContent string   `json:"scriptContent"`          // 脚本内容
+	EncodingType  string   `json:"encodingType"`           // 编码类型 Supports: UTF8, GBK, GB2312, Big5, ISO8859-1
 	Platform      string   `json:"platform"`               // 平台类型
 	ScriptType    string   `json:"scriptType"`             // script Type Supports: Shell, Python, Perl, Bat, Powershell
 	ScriptTimeout int      `json:"scriptTimeout"`          // 超时时间（秒）
@@ -33,6 +34,7 @@ type UpdateVmInstanceScriptDetailParam struct {
 	Name          string `json:"name,omitempty"`          // 资源名称
 	Description   string `json:"description,omitempty"`   // 资源描述
 	ScriptContent string `json:"scriptContent,omitempty"` // 脚本内容
+	EncodingType  string `json:"encodingType,omitempty"`  // 编码类型
 	Platform      string `json:"platform,omitempty"`      // 平台类型
 	ScriptType    string `json:"scriptType,omitempty"`    // 脚本类型
 	ScriptTimeout int    `json:"scriptTimeout,omitempty"` // 超时时间（秒）

zstack-sdk-go/pkg/view/vm_script_views.go

@@ -12,6 +12,7 @@ type VmInstanceScriptInventoryView struct {
 	Platform      string `json:"platform"`      // 平台类型，如 Linux
 	ScriptType    string `json:"scriptType"`    // 脚本类型，如 Shell
 	ScriptTimeout int    `json:"scriptTimeout"` // 超时时间（秒）
+	EncodingType  string `json:"encodingType"`  // 编码类型，如 base64, planText
 }
 
 type VmInstanceScriptResultInventoryView struct {

zstack/provider/resource_zstack_instance_scripts.go

@@ -36,6 +36,7 @@ type scriptModel struct {
 	Platform      types.String `tfsdk:"platform"`
 	ScriptType    types.String `tfsdk:"script_type"`
 	ScriptTimeout types.Int64  `tfsdk:"script_timeout"`
+	EncodingType  types.String `tfsdk:"encoding_type"` // Optional, default is empty
 }
 
 func ScriptResource() resource.Resource {
@@ -78,6 +79,13 @@ func (r *scriptResource) Schema(_ context.Context, request resource.SchemaReques
 				Optional:    true,
 				Description: "The description of the script.",
 			},
+			"encoding_type": schema.StringAttribute{
+				Required:    true,
+				Description: "The encoding type of the script content. Supports: Base64, PlainText.",
+				Validators: []validator.String{
+					stringvalidator.OneOf("Base64", "PlainText"),
+				},
+			},
 			"script_content": schema.StringAttribute{
 				Required:    true,
 				Description: "The content of the script.",
@@ -151,6 +159,8 @@ func (r *scriptResource) Create(ctx context.Context, request resource.CreateRequ
 		description = plan.Description.ValueString()
 	}
 
+	//encodingType := plan.EncodingType.ValueString()
+
 	ok, pattern := isScriptContentSafe(plan.ScriptContent.ValueString())
 	if !ok {
 		response.Diagnostics.AddError(
@@ -160,6 +170,11 @@ func (r *scriptResource) Create(ctx context.Context, request resource.CreateRequ
 		return
 	}
 
+	encodingType := "Base64" // Default encoding type
+	if !plan.EncodingType.IsNull() && !plan.EncodingType.IsUnknown() && plan.EncodingType.ValueString() != "" {
+		encodingType = plan.EncodingType.ValueString()
+	}
+
 	var systemTags []string
 
 	Param := param.CreateVmInstanceScriptParam{
@@ -170,6 +185,7 @@ func (r *scriptResource) Create(ctx context.Context, request resource.CreateRequ
 			Name:          plan.Name.ValueString(),
 			Description:   description,
 			ScriptContent: plan.ScriptContent.ValueString(),
+			EncodingType:  encodingType,
 			Platform:      plan.Platform.ValueString(),
 			ScriptType:    plan.ScriptType.ValueString(),
 			ScriptTimeout: int(scriptTimeout),
@@ -194,6 +210,7 @@ func (r *scriptResource) Create(ctx context.Context, request resource.CreateRequ
 	plan.Platform = types.StringValue(script.Platform)
 	plan.ScriptType = types.StringValue(script.ScriptType)
 	plan.ScriptTimeout = types.Int64Value(int64(script.ScriptTimeout))
+	plan.EncodingType = types.StringValue(script.EncodingType)
 
 	diags = response.State.Set(ctx, plan)
 	response.Diagnostics.Append(diags...)
@@ -280,29 +297,48 @@ func (r *scriptResource) Update(ctx context.Context, request resource.UpdateRequ
 		description = plan.Description.ValueString()
 	}
 
-	ok, pattern := isScriptContentSafe(plan.ScriptContent.ValueString())
-	if !ok {
-		response.Diagnostics.AddError(
-			"Dangerous script content detected",
-			fmt.Sprintf("The script content contains dangerous commands and is not allowed. %s", pattern),
-		)
-		return
+	if !plan.ScriptContent.IsNull() && !plan.ScriptContent.IsUnknown() {
+		ok, pattern := isScriptContentSafe(plan.ScriptContent.ValueString())
+		if !ok {
+			response.Diagnostics.AddError(
+				"Dangerous script content detected",
+				fmt.Sprintf("The script content contains dangerous commands and is not allowed. %s", pattern),
+			)
+			return
+		}
+
 	}
 
 	var systemTags []string
+	detailParam := param.UpdateVmInstanceScriptDetailParam{
+		Name:          plan.Name.ValueString(),
+		Description:   description,
+		Platform:      plan.Platform.ValueString(),
+		ScriptType:    plan.ScriptType.ValueString(),
+		ScriptTimeout: int(scriptTimeout),
+		RenderParams:  renderParams,
+	}
+
+	scriptContent := plan.ScriptContent.ValueString()
+	encodingType := plan.EncodingType.ValueString()
+
+	if scriptContent != "" || encodingType != "" {
+		if scriptContent == "" || encodingType == "" {
+			response.Diagnostics.AddError(
+				"Update Script Error",
+				"Both scriptContent and encodingType must be provided together during update, or both must be omitted.",
+			)
+			return
+		}
+		detailParam.ScriptContent = scriptContent
+		detailParam.EncodingType = encodingType
+	}
+
 	Param := param.UpdateVmInstanceScriptParam{
 		BaseParam: param.BaseParam{
 			SystemTags: systemTags,
 		},
-		Params: param.UpdateVmInstanceScriptDetailParam{
-			Name:          plan.Name.ValueString(),
-			Description:   description,
-			ScriptContent: plan.ScriptContent.ValueString(),
-			Platform:      plan.Platform.ValueString(),
-			ScriptType:    plan.ScriptType.ValueString(),
-			ScriptTimeout: int(scriptTimeout),
-			RenderParams:  renderParams,
-		},
+		Params: detailParam,
 	}
 
 	tflog.Debug(ctx, "Updating VM instance script", map[string]interface{}{