rewrite - fix template-converter and minor refresh (#11725)

Author: c2thorn

mmv1/template-converter.go

@@ -61,7 +61,7 @@ func convertTemplate(folder, tempFileTargets string) int {
 		if checkExceptionList(filePath) {
 			continue
 		}
-		if len(tempSlice) > 0 {
+		if len(tempSlice) > 1 {
 			// log.Printf("%s", filePath)
 			if !slices.Contains(tempSlice, filePath) {
 				continue
@@ -77,7 +77,7 @@ func convertTemplate(folder, tempFileTargets string) int {
 
 		goTemplate := strings.Replace(file, "erb", "tmpl", 1)
 		outPath := path.Join(goDir, goTemplate)
-		if len(tempSlice) > 0 {
+		if len(tempSlice) > 1 {
 			outPath = outPath + ".temp"
 		}
 		err = ioutil.WriteFile(outPath, data, 0644)
@@ -148,7 +148,7 @@ func convertHandwrittenFiles(folder, handwrittenTempFiles string) int {
 		if checkExceptionList(filePath) {
 			continue
 		}
-		if len(tempSlice) > 0 {
+		if len(tempSlice) > 1 {
 			if !slices.Contains(tempSlice, filePath) {
 				continue
 			}
@@ -166,7 +166,7 @@ func convertHandwrittenFiles(folder, handwrittenTempFiles string) int {
 			goTemplate = strings.Replace(file, ".erb", "", 1)
 		}
 		outPath := path.Join(goDir, goTemplate)
-		if len(tempSlice) > 0 {
+		if len(tempSlice) > 1 {
 			outPath = outPath + ".temp"
 		}
 		err = ioutil.WriteFile(outPath, data, 0644)

mmv1/third_party/terraform/provider/go/provider_mmv1_resources.go.tmpl

@@ -179,6 +179,7 @@ var handwrittenDatasources = map[string]*schema.Resource{
 	"google_runtimeconfig_config":                      runtimeconfig.DataSourceGoogleRuntimeconfigConfig(),
 	"google_runtimeconfig_variable":                    runtimeconfig.DataSourceGoogleRuntimeconfigVariable(),
 	{{- end }}
+	"google_secret_manager_regional_secret":            secretmanagerregional.DataSourceSecretManagerRegionalRegionalSecret(),
 	"google_secret_manager_secret":                     secretmanager.DataSourceSecretManagerSecret(),
 	"google_secret_manager_secrets":                    secretmanager.DataSourceSecretManagerSecrets(),
 	"google_secret_manager_secret_version":             secretmanager.DataSourceSecretManagerSecretVersion(),

mmv1/third_party/terraform/services/compute/go/resource_compute_instance_test.go.tmpl

@@ -3360,11 +3360,11 @@ func TestAccComputeInstance_proactiveAttributionLabel(t *testing.T) {
 }
 
 {{ if ne $.TargetVersionName `ga` -}}
+const errorDeleteAccessConfigWithSecPolicy = "Cannot delete an access config with a security policy set. Please remove the security policy first"
+
 // The tests related to security_policy use network_edge_security_service resource
 // which can only exist one per region. Because of that, all the following tests must run serially.
 func TestAccComputeInstanceNetworkIntefaceWithSecurityPolicy(t *testing.T) {
-	// Consistently failing - https://github.com/hashicorp/terraform-provider-google/issues/17838
-	acctest.SkipIfVcr(t)
 	testCases := map[string]func(t *testing.T){
 		"two_access_config": testAccComputeInstance_nic_securityPolicyCreateWithTwoAccessConfigs,
 		"two_nics_access_config_with_empty_nil_security_policy":   testAccComputeInstance_nic_securityPolicyCreateWithEmptyAndNullSecurityPolicies,
@@ -3547,11 +3547,7 @@ func testAccComputeInstance_nic_securityPolicyCreateWithTwoNicsAndTwoAccessConfi
 			},
 			{
 				Config: testAccComputeInstance_nic_securityPolicyCreateWithTwoNicsAndTwoAccessConfigsUpdateTwoPoliciesRemoveAccessConfig(suffix, policyName, policyName2, instanceName, "google_compute_region_security_policy.policyforinstance.self_link", "google_compute_region_security_policy.policyforinstance.self_link"),
-				Check: resource.ComposeTestCheckFunc(
-					testAccCheckComputeInstanceExists(
-						t, "google_compute_instance.foobar", &instance),
-					testAccCheckComputeInstanceNicAccessConfigHasSecurityPolicy(&instance, policyName),
-				),
+				ExpectError: regexp.MustCompile(errorDeleteAccessConfigWithSecPolicy),
 			},
 			{
 				ResourceName:      "google_compute_instance.foobar",
@@ -3657,11 +3653,7 @@ func testAccComputeInstance_nic_securityPolicyCreateWithAccessConfigUpdateAccess
 			},
 			{
 				Config: testAccComputeInstance_nic_securityPolicyCreateWithTwoAccessConfigsUpdateAccessConfig(suffix, policyName, instanceName),
-				Check: resource.ComposeTestCheckFunc(
-					testAccCheckComputeInstanceExists(
-						t, "google_compute_instance.foobar", &instance),
-					testAccCheckComputeInstanceNicAccessConfigHasSecurityPolicy(&instance, policyName),
-				),
+				ExpectError: regexp.MustCompile(errorDeleteAccessConfigWithSecPolicy),
 			},
 			{
 				ResourceName:      "google_compute_instance.foobar",