Go rewrite diffs fix (GoogleCloudPlatform#11659)

BBBmau · Sep 9, 2024 · 8c0282d · 8c0282d
1 parent 924f914
commit 8c0282d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/mmv1/products/securitycenterv2/ProjectMuteConfig.yaml b/mmv1/products/securitycenterv2/ProjectMuteConfig.yaml
@@ -35,7 +35,7 @@ examples:
     vars:
       mute_config_id: 'my-config'
     test_env_vars:
-      project_id: PROJECT_NAME
+      project_id: :PROJECT_NAME
 parameters:
   - !ruby/object:Api::Type::String
     name: location

diff --git a/mmv1/templates/terraform/env_var_context.go.tmpl b/mmv1/templates/terraform/env_var_context.go.tmpl
@@ -30,4 +30,7 @@
 		"{{$varKey}}": envvar.GetTestZoneFromEnv(),
 		{{- end }}
 	{{- end }}
+	{{- if and $.HasNewLine (gt (len $.TestEnvVars) 0)}}
+	{{""}}
+	{{- end}}
 {{- end }}
diff --git a/mmv1/templates/terraform/examples/base_configs/test_file.go.tmpl b/mmv1/templates/terraform/examples/base_configs/test_file.go.tmpl
@@ -44,7 +44,7 @@ func TestAcc{{ $e.TestSlug $.Res.ProductMetadata.Name $.Res.Name }}(t *testing.T
 	t.Parallel()
 
 	context := map[string]interface{}{
-	{{- template "EnvVarContext" $e }}
+	{{- template "EnvVarContext" dict "TestEnvVars" $e.TestEnvVars "HasNewLine" false}}
 	{{- range $varKey, $varVal := $e.TestVarsOverrides }}
 		"{{$varKey}}": {{$varVal}},
 	{{- end }}

diff --git a/mmv1/templates/terraform/iam/go/iam_context.go.tmpl b/mmv1/templates/terraform/iam/go/iam_context.go.tmpl
@@ -8,7 +8,7 @@
 {{- if $.IamPolicy.TestProjectName }}
 		"project_id" :   fmt.Sprintf("{{ $.IamPolicy.TestProjectName }}%s", acctest.RandString(t, 10)),
 {{- end }}
-{{- template "EnvVarContext" $.FirstTestExample }}
+{{- template "EnvVarContext" dict "TestEnvVars" $.FirstTestExample.TestEnvVars "HasNewLine" true}}
 {{- if $.FirstTestExample.TestVarsOverrides }}
 {{-    range $varName, $override := $.FirstTestExample.TestVarsOverrides }}
 		"{{ $varName }}": {{ $override }},