withriley
diff --git a/‎.gitattributes
Lines changed: 2 additions & 0 deletions b/‎.gitattributes
Lines changed: 2 additions & 0 deletions
diff --git a/‎.github/actions/fabric-tests/action.yml
Lines changed: 1 addition & 1 deletion b/‎.github/actions/fabric-tests/action.yml
Lines changed: 1 addition & 1 deletion
diff --git a/‎.github/pull_request_template.md
Lines changed: 15 additions & 0 deletions b/‎.github/pull_request_template.md
Lines changed: 15 additions & 0 deletions
diff --git a/‎.github/workflows/linting.yml
Lines changed: 23 additions & 5 deletions b/‎.github/workflows/linting.yml
Lines changed: 23 additions & 5 deletions
diff --git a/‎.github/workflows/tests.yml
Lines changed: 24 additions & 2 deletions b/‎.github/workflows/tests.yml
Lines changed: 24 additions & 2 deletions
diff --git a/‎.pre-commit-config.yaml
Lines changed: 15 additions & 0 deletions b/‎.pre-commit-config.yaml
Lines changed: 15 additions & 0 deletions
@@ -1 +1,3 @@
 *.md ident
+versions.tf linguist-generated=true
+versions.tofu linguist-generated=true
@@ -72,7 +72,7 @@ runs:
       shell: bash
       run: |
         for f in $(find . -name versions.tf); do
-          sed -i -e 's/>=\(.*# tftest\)/=\1/g' -e 's/required_version = .*$/required_version = ">= ${{ inputs.TERRAFORM_VERSION }}"/g' $f;
+          sed -i 's/>=\(.*# tftest\)/=\1/g' $f;
         done
     - name: Install Python Dependencies
       shell: bash
 
@@ -11,3 +11,18 @@ I applicable, I acknowledge that I have:
 - [ ] Ran `terraform fmt` on all modified files
 - [ ] Regenerated the relevant README.md files using [`tools/tfdoc.py`](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/blob/master/CONTRIBUTING.md#fabric-tools)
 - [ ] Made sure all relevant tests pass
+
+<!--
+If your code introduces any breaking changes, uncomment and complete the section below, following the examples provided.
+-->
+
+<!--
+**Breaking Changes**
+
+```upgrade-note
+`fast/stages/0-boostrap`: example upgrade note 1.
+```
+```upgrade-note
+`modules/project`: example upgrade note 2.
+```
+-->
@@ -1,4 +1,4 @@
-# Copyright 2024 Google LLC
+# Copyright 2025 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -95,7 +95,8 @@ jobs:
         run: |
           yapf -p -d -r \
             tools/*.py \
-            blueprints
+            blueprints \
+            fast
 
       - name: Check blueprint metadata
         id: metadata
@@ -105,6 +106,23 @@ jobs:
       - name: Check modules versions
         id: versions
         run: |
-          OUTPUT=$(find . -type f -name 'versions.tf' -exec diff -ub default-versions.tf {} \;)
-          echo "${OUTPUT}"
-          [[ -z "${OUTPUT}" ]]
+          OUTPUT_TF=$(find . -type f -name 'versions.tf' -exec diff -I '[[:space:]]*module_name' -ub default-versions.tf {} \;)
+          if [[ -n "${OUTPUT_TF}" ]] ; then
+            echo "Terraform versions.tf:"
+            echo "${OUTPUT_TF}"
+          fi
+          OUTPUT_TOFU=$(find . -type f -name 'versions.tofu' -exec diff -I '[[:space:]]*module_name' -ub default-versions.tofu {} \;)
+          if [[ -n "${OUTPUT_TOFU}" ]] ; then
+            echo "Terraform versions.tofu:"
+            echo "${OUTPUT_TOFU}"
+          fi
+          egrep -v "(required_version|module_name)" default-versions.tf > /tmp/versions.tf
+          egrep -v "(required_version|module_name)" default-versions.tofu > /tmp/versions.tofu
+          diff -rub /tmp/versions.tf /tmp/versions.tofu
+          DIFF_EC=$?
+          [[ "${DIFF_EC}" -eq "0" ||  -z "${OUTPUT_TF}" || -z "${OUTPUT_TOFU}" ]]
+
+      - name: Check for diverging files
+        id: duplicates
+        run: |
+          python3 tools/duplicate-diff.py
@@ -1,4 +1,4 @@
-# Copyright 2024 Google LLC
+# Copyright 2025 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -38,7 +38,7 @@ env:
   TFTEST_COPY: 1
   DEFAULT_TERRAFORM_FLAVOUR: terraform
   DEFAULT_TERRAFORM_VERSION: ${{ inputs.terraform_version || '1.10.2' }}
-  DEFAULT_TOFU_VERSION: "1.7.2"
+  DEFAULT_TOFU_VERSION: "1.9.0"
 
 jobs:
   compute-matrix:
@@ -128,6 +128,28 @@ jobs:
         with:
           MODULE: Blueprint Examples
 
+  examples-project-templates:
+    runs-on: ubuntu-latest
+    needs: setup-tf-providers
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Call composite action fabric-tests
+        uses: ./.github/actions/fabric-tests
+        with:
+          PYTHON_VERSION: ${{ env.PYTHON_VERSION }}
+          TERRAFORM_VERSION: ${{ env.DEFAULT_TERRAFORM_VERSION }}
+          TERRAFORM_FLAVOUR: ${{ env.DEFAULT_TERRAFORM_FLAVOUR }}
+
+      - name: Run tests on documentation examples
+        run: pytest -vv -n4 --tb=line --junit-xml=test-results-raw.xml -k fast/project-templates/ tests/examples
+
+      - name: Create report
+        uses: ./.github/actions/post-fabric-tests
+        if: always()
+        with:
+          MODULE: Project Templates Examples
+
   examples-modules:
     runs-on: ubuntu-latest
     needs:
 
@@ -56,6 +56,12 @@ repos:
     files: (versions.tf|^default-versions.tf)$
     pass_filenames: false
     entry: /usr/bin/find . -type f -name 'versions.tf' -exec cp default-versions.tf {} \;
+  - id: versions_tofu
+    name: Align OpenTofu provider versions
+    language: script
+    files: (versions.tofu|^default-versions.tofu)$
+    pass_filenames: false
+    entry: /usr/bin/find . -type f -name 'versions.tofu' -exec cp default-versions.tofu {} \;
   - id: validate_metadata
     name: Validate blueprints metadata
     language: system
@@ -72,6 +78,15 @@ repos:
     name: Check links in markdown files
     language: system
     entry: tools/check_links.py --no-show-summary --scan-files
+  - id: duplicate-diff
+    name: duplicate-diff
+    entry: python3 tools/duplicate-diff.py
+    language: python
+    language_version: python3
+    files: '.*(\.sh|\.tf|\.tftpl|\.tpl)$'
+    pass_filenames: true
+    require_serial: true
+
 
 # - repo: https://github.com/adrienverge/yamllint
 #   rev: v1.34.0
Original file line number	Diff line number	Diff line change
`@@ -1 +1,3 @@`
`1`	`1`	`*.md ident`
	`2`	`+versions.tf linguist-generated=true`
	`3`	`+versions.tofu linguist-generated=true`