go rewrite - sort context map in test file (GoogleCloudPlatform#10975)

vijaykanthm · Jun 17, 2024 · bb3772e · bb3772e
1 parent 82c34ca
commit bb3772e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/mmv1/templates/terraform/env_var_context.go.erb b/mmv1/templates/terraform/env_var_context.go.erb
@@ -1,4 +1,5 @@
-<% example.test_env_vars&.each do |var_name, var_type| -%>
+<% unless example.test_env_vars.nil? -%>
+<% example.test_env_vars.sort.each do |var_name, var_type| -%>
 	<% if var_type == :ORG_ID  -%>
 		"<%= var_name -%>": envvar.GetTestOrgFromEnv(t),
 	<% elsif var_type == :ORG_DOMAIN  -%>
@@ -29,3 +30,4 @@
 		"<%= var_name -%>": envvar.GetTestZoneFromEnv(),
 	<% end -%>
 <% end -%>
+<% end -%>
diff --git a/mmv1/templates/terraform/examples/base_configs/test_file.go.erb b/mmv1/templates/terraform/examples/base_configs/test_file.go.erb
@@ -67,7 +67,7 @@ func TestAcc<%= test_slug -%>(t *testing.T) {
 	context := map[string]interface{} {
 <%= lines(indent(compile(pwd + '/templates/terraform/env_var_context.go.erb'), 4)) -%>
 	<% unless example.test_vars_overrides.nil? -%>
-	<% example.test_vars_overrides.each do |var_name, override| -%>
+	<% example.test_vars_overrides.sort.each do |var_name, override| -%>
 			"<%= var_name %>": <%= override %>,
 	<% end -%>
 	<% end -%>