PaloAltoNetworks · migara · Apr 29, 2023 · Mar 21, 2023 · Mar 22, 2023 · Mar 22, 2023
diff --git a/.github/workflows/lint_pr_title.yml b/.github/workflows/lint_pr_title.yml
@@ -18,4 +18,4 @@ on:
 jobs:
   lint_pr_title:
     name: Lint PR
-    uses: PaloAltoNetworks/terraform-modules-vmseries-ci-workflows/.github/workflows/[email protected].1
+    uses: PaloAltoNetworks/terraform-modules-vmseries-ci-workflows/.github/workflows/[email protected].2
diff --git a/.github/workflows/pr_ci.yml b/.github/workflows/pr_ci.yml
@@ -19,8 +19,8 @@ on:
 jobs:
   pr_ci_wrkflw:
     name: Run CI
-    uses: PaloAltoNetworks/terraform-modules-vmseries-ci-workflows/.github/workflows/[email protected].1
+    uses: PaloAltoNetworks/terraform-modules-vmseries-ci-workflows/.github/workflows/[email protected].2
     secrets: inherit
     with:
       cloud: azure
-      tf_version: 1.0 1.1 1.2 1.3 1.4
+      tf_version: 1.2 1.3 1.4
diff --git a/.github/workflows/release_ci.yml b/.github/workflows/release_ci.yml
@@ -15,9 +15,9 @@ on:
 jobs:
   release_wrkflw:
     name: Do release
-    uses: PaloAltoNetworks/terraform-modules-vmseries-ci-workflows/.github/workflows/[email protected].1
+    uses: PaloAltoNetworks/terraform-modules-vmseries-ci-workflows/.github/workflows/[email protected].2
     secrets: inherit
     with:
       cloud: azure
       max_parallel: 10
-      tf_version: 1.0 1.1 1.2 1.3 1.4
+      tf_version: 1.2 1.3 1.4
diff --git a/.gitignore b/.gitignore
@@ -46,5 +46,6 @@ terraform.tfvars.json
 *.auto.tfvars
 *.auto.tfvars.json
 *.tfplan
-**/files
+# **/
+*bootstrap.xml
 
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -4,7 +4,10 @@ repos:
     hooks:
       - id: terraform_fmt 
       - id: terraform_docs
-        args: ['--args=--lockfile=false']
+        args: [
+          '--args=--sort=false',
+          '--args=--lockfile=false',
+        ]
       - id: terraform_tflint
         args: [
           --args=--only=terraform_deprecated_interpolation,

diff --git a/examples/bootstrap/Makefile b/examples/bootstrap/Makefile
diff --git a/examples/bootstrap/README.md b/examples/bootstrap/README.md
diff --git a/examples/bootstrap/example.tfvars b/examples/bootstrap/example.tfvars
diff --git a/examples/bootstrap/inbound_files/authcodes.sample b/examples/bootstrap/inbound_files/authcodes.sample
diff --git a/examples/bootstrap/inbound_files/init-cfg.sample.txt b/examples/bootstrap/inbound_files/init-cfg.sample.txt
diff --git a/examples/bootstrap/main.tf b/examples/bootstrap/main.tf
diff --git a/examples/bootstrap/obew_files/authcodes.sample b/examples/bootstrap/obew_files/authcodes.sample
diff --git a/examples/bootstrap/obew_files/init-cfg.sample.txt b/examples/bootstrap/obew_files/init-cfg.sample.txt
diff --git a/examples/bootstrap/outputs.tf b/examples/bootstrap/outputs.tf
diff --git a/examples/bootstrap/variables.tf b/examples/bootstrap/variables.tf
diff --git a/examples/common_vmseries/Makefile b/examples/common_vmseries/Makefile
@@ -0,0 +1,39 @@
+init:
+	@../../makefile.sh init
+
+prep_vars: check_uuid
+	@../../makefile.sh prep_vars
+
+validate:
+	@../../makefile.sh validate
+
+plan: check_uuid init
+	@../../makefile.sh plan '${TF_PARAMS}'
+
+plan_file: check_uuid init
+	@../../makefile.sh plan_file '${TF_PARAMS}'
+
+apply_file:
+	@../../makefile.sh apply_file
+
+apply: check_uuid init plan_file apply_file
+
+idempotence: check_uuid
+	@../../makefile.sh idempotence '${TF_PARAMS}'
+
+destroy: check_uuid
+	@../../makefile.sh destroy '${TF_PARAMS}'
+
+delete_rg: check_uuid
+	@../../makefile.sh delete_rg '${PREFIX}${RG}'
+
+check_uuid:
+ifndef UUID
+	$(info Missing UUID, generate one for yourself using command:)
+	$(info export UUID=$$(uuidgen | tr '[:upper:]' '[:lower:]'))
+	$(error )
+else
+RG := $(shell echo ${UUID} | cut -d '-' -f 1,5)
+PREFIX := ghci$(shell echo ${UUID} | cut -d '-' -f 2)-
+TF_PARAMS := -var-file=example.tfvars -var resource_group_name=${RG} -var name_prefix=${PREFIX}
+endif