Embed scripts as strings rather than []byte

This is to reduce the amount of type conversions needed.
Azure · Aug 15, 2024 · 374af12 · 374af12
1 parent 7f65006
commit 374af12
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 46 deletions.
diff --git a/pkg/deploy/assets/gateway-production.json b/pkg/deploy/assets/gateway-production.json
diff --git a/pkg/deploy/assets/rp-production.json b/pkg/deploy/assets/rp-production.json
diff --git a/pkg/deploy/generator/resources_dev.go b/pkg/deploy/generator/resources_dev.go
@@ -101,15 +101,9 @@ func (g *generator) devProxyVMSS() *arm.Resource {
 		)
 	}
 
-	var sb strings.Builder
-
-	sb.WriteString(string(scriptDevProxyVMSS))
-
-	trailer := base64.StdEncoding.EncodeToString([]byte(sb.String()))
-
+	trailer := base64.StdEncoding.EncodeToString([]byte(scriptDevProxyVMSS))
 	parts = append(parts, "'\n'", fmt.Sprintf("base64ToString('%s')", trailer))
-
-	script := fmt.Sprintf("[base64(concat(%s))]", strings.Join(parts, ","))
+	customScript := fmt.Sprintf("[base64(concat(%s))]", strings.Join(parts, ","))
 
 	return &arm.Resource{
 		Resource: &mgmtcompute.VirtualMachineScaleSet{
@@ -217,7 +211,7 @@ func (g *generator) devProxyVMSS() *arm.Resource {
 									AutoUpgradeMinorVersion: to.BoolPtr(true),
 									Settings:                map[string]interface{}{},
 									ProtectedSettings: map[string]interface{}{
-										"script": script,
+										"script": customScript,
 									},
 								},
 							},

diff --git a/pkg/deploy/generator/resources_gateway.go b/pkg/deploy/generator/resources_gateway.go
@@ -241,23 +241,17 @@ func (g *generator) gatewayVMSS() *arm.Resource {
 		"''')\n'",
 	)
 
-	var sb strings.Builder
-
 	// VMSS extensions only support one custom script
 	// Because of this, the util-*.sh scripts are prefixed to the bootstrapping script
 	// main is called at the end of the bootstrapping script, so appending them will not work
-	sb.WriteString(string(scriptUtilCommon))
-	sb.WriteString(string(scriptUtilPackages))
-	sb.WriteString(string(scriptUtilServices))
-	sb.WriteString(string(scriptUtilSystem))
-	sb.WriteString("\n#Start of gatewayVMSS.sh\n")
-	sb.WriteString(string(scriptGatewayVMSS))
-
-	trailer := base64.StdEncoding.EncodeToString([]byte(sb.String()))
-
+	bootstrapScript := scriptUtilCommon +
+		scriptUtilPackages +
+		scriptUtilServices +
+		scriptUtilSystem +
+		scriptGatewayVMSS
+	trailer := base64.StdEncoding.EncodeToString([]byte(bootstrapScript))
 	parts = append(parts, "'\n'", fmt.Sprintf("base64ToString('%s')", trailer))
-
-	script := fmt.Sprintf("[base64(concat(%s))]", strings.Join(parts, ","))
+	customScript := fmt.Sprintf("[base64(concat(%s))]", strings.Join(parts, ","))
 
 	return &arm.Resource{
 		Resource: &mgmtcompute.VirtualMachineScaleSet{
@@ -362,7 +356,7 @@ func (g *generator) gatewayVMSS() *arm.Resource {
 									AutoUpgradeMinorVersion: to.BoolPtr(true),
 									Settings:                map[string]interface{}{},
 									ProtectedSettings: map[string]interface{}{
-										"script": script,
+										"script": customScript,
 									},
 								},
 							},

diff --git a/pkg/deploy/generator/resources_rp.go b/pkg/deploy/generator/resources_rp.go
@@ -441,23 +441,17 @@ func (g *generator) rpVMSS() *arm.Resource {
 		"''')\n'",
 	)
 
-	var sb strings.Builder
-
 	// VMSS extensions only support one custom script
 	// Because of this, the util-*.sh scripts are prefixed to the bootstrapping script
 	// main is called at the end of the bootstrapping script, so appending them will not work
-	sb.WriteString(string(scriptUtilCommon))
-	sb.WriteString(string(scriptUtilPackages))
-	sb.WriteString(string(scriptUtilServices))
-	sb.WriteString(string(scriptUtilSystem))
-	sb.WriteString("\n#Start of rpVMSS.sh\n")
-	sb.WriteString(string(scriptRpVMSS))
-
-	trailer := base64.StdEncoding.EncodeToString([]byte(sb.String()))
-
+	bootstrapScript := scriptUtilCommon +
+		scriptUtilPackages +
+		scriptUtilServices +
+		scriptUtilSystem +
+		scriptRpVMSS
+	trailer := base64.StdEncoding.EncodeToString([]byte(bootstrapScript))
 	parts = append(parts, "'\n'", fmt.Sprintf("base64ToString('%s')", trailer))
-
-	script := fmt.Sprintf("[base64(concat(%s))]", strings.Join(parts, ","))
+	customScript := fmt.Sprintf("[base64(concat(%s))]", strings.Join(parts, ","))
 
 	return &arm.Resource{
 		Resource: &mgmtcompute.VirtualMachineScaleSet{
@@ -560,7 +554,7 @@ func (g *generator) rpVMSS() *arm.Resource {
 									AutoUpgradeMinorVersion: to.BoolPtr(true),
 									Settings:                map[string]interface{}{},
 									ProtectedSettings: map[string]interface{}{
-										"script": script,
+										"script": customScript,
 									},
 								},
 							},

diff --git a/pkg/deploy/generator/scripts.go b/pkg/deploy/generator/scripts.go
@@ -8,22 +8,22 @@ import (
 )
 
 //go:embed scripts/devProxyVMSS.sh
-var scriptDevProxyVMSS []byte
+var scriptDevProxyVMSS string
 
 //go:embed scripts/gatewayVMSS.sh
-var scriptGatewayVMSS []byte
+var scriptGatewayVMSS string
 
 //go:embed scripts/rpVMSS.sh
-var scriptRpVMSS []byte
+var scriptRpVMSS string
 
 //go:embed scripts/util-system.sh
-var scriptUtilSystem []byte
+var scriptUtilSystem string
 
 //go:embed scripts/util-services.sh
-var scriptUtilServices []byte
+var scriptUtilServices string
 
 //go:embed scripts/util-packages.sh
-var scriptUtilPackages []byte
+var scriptUtilPackages string
 
 //go:embed scripts/util-common.sh
-var scriptUtilCommon []byte
+var scriptUtilCommon string