validate template syntax needed (GoogleCloudPlatform#13929)

Author: ScottSuarez

.github/workflows/mmv1-check-templates.yml

@@ -1,13 +1,33 @@
-name: mmv1-lint-product-yaml
+name: mmv1
 
 permissions: read-all
 
 on:
   pull_request:
     paths:
-      - 'mmv1/products/**'
+      - 'mmv1/**'
 
 jobs:
+  version-guard-check:
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.2
+        with:
+          path: repo
+          fetch-depth: 0
+      - name: Merge base branch
+        id: pull_request
+        run: |
+          cd repo
+          git config user.name "modular-magician"
+          git config user.email "magic-modules@google.com"
+          git fetch origin ${{ github.base_ref }} # Fetch the base branch
+          git merge --no-ff origin/${{ github.base_ref }} # Merge with the base branch
+      - name: Check for invalid version guards
+        run: |
+          cd repo/tools/template-check
+          git diff --name-only --diff-filter=d origin/${{ github.base_ref }} ../../*.tmpl | sed 's=^=../../=g' | go run main.go
   lint-yaml:
     runs-on: ubuntu-22.04
     steps:
@@ -34,3 +54,16 @@ jobs:
       - name: Lint YAML files
         if: ${{ !failure() && steps.pull_request.outputs.yamlfiles != '' }}
         run: yamllint -c repo/.yamllint ${{steps.pull_request.outputs.yamlfiles}}
+  unit-tests:
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.2
+      - name: Set up Go
+        uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
+        with:
+          go-version: '^1.23'
+      - name: Run mmv1 unit tests
+        run: |
+          cd mmv1
+          go test ./... -v
+

…hub/workflows/mmv1-lint-product-yaml.yml .github/workflows/unit-test-mmv1.yml.github/workflows/mmv1-lint-product-yaml.yml renamed to .github/workflows/unit-test-mmv1.yml .github/workflows/mmv1-lint-product-yaml.yml renamed to .github/workflows/unit-test-mmv1.yml

@@ -344,7 +344,7 @@ func (t Terraform) getCommonCopyFiles(versionName string, generateCode, generate
 		"go.sum":                           "third_party/terraform/go.sum",
 		"go.mod":                           "third_party/terraform/go.mod",
 		".go-version":                      "third_party/terraform/.go-version",
-		"terraform-registry-manifest.json": "third_party/terraform/terraform-registry-manifest.json.tmpl",
+		"terraform-registry-manifest.json": "third_party/terraform/terraform-registry-manifest.json",
 	}
 	maps.Copy(commonCopyFiles, singleFiles)
 

mmv1/provider/terraform.go

@@ -74,9 +74,9 @@ func (tgc TerraformGoogleConversionNext) CompileCommonFiles(outputFolder string,
 		// common
 		"pkg/transport/config.go":                        "third_party/terraform/transport/config.go.tmpl",
 		"pkg/transport/provider_handwritten_endpoint.go": "third_party/terraform/transport/provider_handwritten_endpoint.go.tmpl",
-		"pkg/tpgresource/common_diff_suppress.go":        "third_party/terraform/tpgresource/common_diff_suppress.go.tmpl",
+		"pkg/tpgresource/common_diff_suppress.go":        "third_party/terraform/tpgresource/common_diff_suppress.go",
 		"pkg/provider/provider.go":                       "third_party/terraform/provider/provider.go.tmpl",
-		"pkg/provider/provider_validators.go":            "third_party/terraform/provider/provider_validators.go.tmpl",
+		"pkg/provider/provider_validators.go":            "third_party/terraform/provider/provider_validators.go",
 
 		// tfplan2cai
 		"pkg/tfplan2cai/converters/resource_converters.go":                       "templates/tgc_next/tfplan2cai/resource_converters.go.tmpl",

mmv1/provider/terraform_tgc_next.go

@@ -85,4 +85,4 @@ func ValidateServiceAccountEmail(v interface{}, k string) (warnings []string, er
 	}
 
 	return
-}
+}

…orm/provider/provider_validators.go.tmpl …erraform/provider/provider_validators.gommv1/third_party/terraform/provider/provider_validators.go.tmpl renamed to mmv1/third_party/terraform/provider/provider_validators.go mmv1/third_party/terraform/provider/provider_validators.go.tmpl renamed to mmv1/third_party/terraform/provider/provider_validators.go

@@ -18,9 +18,9 @@ func TestAccBackupDRBackupVault_fullUpdate(t *testing.T) {
 	referenceTime := time.Date(timeNow.Year(), timeNow.Month(), timeNow.Day(), 0, 0, 0, 0, time.UTC)
 
 	context := map[string]interface{}{
-		"project":                   envvar.GetTestProjectFromEnv(),
+		"project":        envvar.GetTestProjectFromEnv(),
 		"effective_time": referenceTime.Add(24 * time.Hour).Format(time.RFC3339),
-		"random_suffix": acctest.RandString(t, 10),
+		"random_suffix":  acctest.RandString(t, 10),
 	}
 
 	acctest.VcrTest(t, resource.TestCase{
@@ -97,4 +97,4 @@ resource "google_backup_dr_backup_vault" "backup-vault-test" {
   allow_missing = "true"
 }
 `, context)
-}
+}

…urce_backup_dr_backup_vault_test.go.tmpl …/resource_backup_dr_backup_vault_test.gommv1/third_party/terraform/services/backupdr/resource_backup_dr_backup_vault_test.go.tmpl renamed to mmv1/third_party/terraform/services/backupdr/resource_backup_dr_backup_vault_test.go mmv1/third_party/terraform/services/backupdr/resource_backup_dr_backup_vault_test.go.tmpl renamed to mmv1/third_party/terraform/services/backupdr/resource_backup_dr_backup_vault_test.go

@@ -21,7 +21,7 @@ func TestAccBinaryAuthorizationPolicy_basic(t *testing.T) {
 	pid := "tf-test-" + acctest.RandString(t, 10)
 	billingId := envvar.GetTestBillingAccountFromEnv(t)
 	acctest.VcrTest(t, resource.TestCase{
-		PreCheck:  func() { acctest.AccTestPreCheck(t) },
+		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
 		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
 		Steps: []resource.TestStep{
 			{
@@ -165,9 +165,9 @@ func testAccCheckBinaryAuthorizationPolicyDefault(t *testing.T, pid string) reso
 		config := acctest.GoogleProviderConfig(t)
 		url := fmt.Sprintf("https://binaryauthorization.googleapis.com/v1/projects/%s/policy", pid)
 		pol, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
-			Config: config,
-			Method: "GET",
-			RawURL: url,
+			Config:    config,
+			Method:    "GET",
+			RawURL:    url,
 			UserAgent: config.UserAgent,
 		})
 		if err != nil {