revert refs to main

hashicorp · Nov 8, 2023 · a6a95be · a6a95be
1 parent 35b61d5
commit a6a95be
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 24 deletions.
diff --git a/.github/workflows/handler-destroy.yml b/.github/workflows/handler-destroy.yml
@@ -13,7 +13,7 @@ env:
 
 jobs:
   public_active_active:
-    uses: hashicorp/terraform-random-tfe-utility/.github/workflows/destroy.yml@ah/tf-8611-gcp-fdo-3
+    uses: hashicorp/terraform-random-tfe-utility/.github/workflows/destroy.yml@main
     secrets: inherit
     name: Public Active/Active
     if: ${{ github.event.client_payload.slash_command.args.unnamed.all == 'all' || github.event.client_payload.slash_command.args.unnamed.all == 'public-active-active' }}
@@ -30,7 +30,7 @@ jobs:
       TFC_token_secret_name: PUBLIC_ACTIVE_ACTIVE_TFC_TOKEN
 
   private_active_active:
-    uses: hashicorp/terraform-random-tfe-utility/.github/workflows/destroy.yml@ah/tf-8611-gcp-fdo-3
+    uses: hashicorp/terraform-random-tfe-utility/.github/workflows/destroy.yml@main
     secrets: inherit
     name: Private Active/Active
     if: ${{ github.event.client_payload.slash_command.args.unnamed.all == 'all' || github.event.client_payload.slash_command.args.unnamed.all == 'private-active-active' }}
@@ -47,7 +47,7 @@ jobs:
       TFC_token_secret_name: PRIVATE_ACTIVE_ACTIVE_TFC_TOKEN
 
   private_tcp_active_active:
-    uses: hashicorp/terraform-random-tfe-utility/.github/workflows/destroy.yml@ah/tf-8611-gcp-fdo-3
+    uses: hashicorp/terraform-random-tfe-utility/.github/workflows/destroy.yml@main
     secrets: inherit
     name: Private TCP Active/Active
     if: ${{ github.event.client_payload.slash_command.args.unnamed.all == 'all' || github.event.client_payload.slash_command.args.unnamed.all == 'private-tcp-active-active' }}
@@ -64,7 +64,7 @@ jobs:
       TFC_token_secret_name: PRIVATE_TCP_ACTIVE_ACTIVE_TFC_TOKEN
 
   standalone_external_rhel8_worker:
-    uses: hashicorp/terraform-random-tfe-utility/.github/workflows/destroy.yml@ah/tf-8611-gcp-fdo-3
+    uses: hashicorp/terraform-random-tfe-utility/.github/workflows/destroy.yml@main
     secrets: inherit
     name: Standalone External Rhel8 Worker
     if: ${{ github.event.client_payload.slash_command.args.unnamed.all == 'all' || github.event.client_payload.slash_command.args.unnamed.all == 'standalone-external-rhel8-worker' }}
@@ -88,7 +88,7 @@ jobs:
         }\n/'
 
   standalone_mounted_disk:
-    uses: hashicorp/terraform-random-tfe-utility/.github/workflows/destroy.yml@ah/tf-8611-gcp-fdo-3
+    uses: hashicorp/terraform-random-tfe-utility/.github/workflows/destroy.yml@main
     secrets: inherit
     name: Standalone Mounted Disk
     if: ${{ github.event.client_payload.slash_command.args.unnamed.all == 'all' || github.event.client_payload.slash_command.args.unnamed.all == 'standalone-mounted-disk' }}
@@ -112,7 +112,7 @@ jobs:
         }\n/'
 
   public_active_active_replicated:
-    uses: hashicorp/terraform-random-tfe-utility/.github/workflows/destroy.yml@ah/tf-8611-gcp-fdo-3
+    uses: hashicorp/terraform-random-tfe-utility/.github/workflows/destroy.yml@main
     secrets: inherit
     name: Public Active/Active
     if: ${{ github.event.client_payload.slash_command.args.unnamed.all == 'all' || github.event.client_payload.slash_command.args.unnamed.all == 'public-active-active-replicated' }}
@@ -130,7 +130,7 @@ jobs:
       TFC_workspace_substitution_pattern: s/google-public-active-active/google-public-active-active-replicated/
 
   private_active_active_replicated:
-    uses: hashicorp/terraform-random-tfe-utility/.github/workflows/destroy.yml@ah/tf-8611-gcp-fdo-3
+    uses: hashicorp/terraform-random-tfe-utility/.github/workflows/destroy.yml@main
     secrets: inherit
     name: Private Active/Active
     if: ${{ github.event.client_payload.slash_command.args.unnamed.all == 'all' || github.event.client_payload.slash_command.args.unnamed.all == 'private-active-active-replicated' }}
@@ -148,7 +148,7 @@ jobs:
       TFC_workspace_substitution_pattern: s/google-private-active-active/google-private-active-active-replicated/
 
   private_tcp_active_active_replicated:
-    uses: hashicorp/terraform-random-tfe-utility/.github/workflows/destroy.yml@ah/tf-8611-gcp-fdo-3
+    uses: hashicorp/terraform-random-tfe-utility/.github/workflows/destroy.yml@main
     secrets: inherit
     name: Private TCP Active/Active
     if: ${{ github.event.client_payload.slash_command.args.unnamed.all == 'all' || github.event.client_payload.slash_command.args.unnamed.all == 'private-tcp-active-active-replicated' }}
@@ -166,7 +166,7 @@ jobs:
       TFC_workspace_substitution_pattern: s/google-private-tcp-active-active/google-private-tcp-active-active-replicated/
 
   standalone_external_rhel8_worker_replicated:
-    uses: hashicorp/terraform-random-tfe-utility/.github/workflows/destroy.yml@ah/tf-8611-gcp-fdo-3
+    uses: hashicorp/terraform-random-tfe-utility/.github/workflows/destroy.yml@main
     secrets: inherit
     name: Standalone External Rhel8 Worker
     if: ${{ github.event.client_payload.slash_command.args.unnamed.all == 'all' || github.event.client_payload.slash_command.args.unnamed.all == 'standalone-external-rhel8-worker-replicated' }}
@@ -190,7 +190,7 @@ jobs:
         }\n/'
 
   standalone_mounted_disk_replicated:
-    uses: hashicorp/terraform-random-tfe-utility/.github/workflows/destroy.yml@ah/tf-8611-gcp-fdo-3
+    uses: hashicorp/terraform-random-tfe-utility/.github/workflows/destroy.yml@main
     secrets: inherit
     name: Standalone Mounted Disk
     if: ${{ github.event.client_payload.slash_command.args.unnamed.all == 'all' || github.event.client_payload.slash_command.args.unnamed.all == 'standalone-mounted-disk-replicated' }}

diff --git a/.github/workflows/handler-test.yml b/.github/workflows/handler-test.yml
@@ -13,7 +13,7 @@ env:
 
 jobs:
   public_active_active:
-    uses: hashicorp/terraform-random-tfe-utility/.github/workflows/google-tests.yml@ah/tf-8611-gcp-fdo-3
+    uses: hashicorp/terraform-random-tfe-utility/.github/workflows/google-tests.yml@main
     secrets: inherit
     name: Public Active/Active
     if: ${{ github.event.client_payload.slash_command.args.unnamed.all == 'all' || github.event.client_payload.slash_command.args.unnamed.all == 'public-active-active' }}
@@ -32,7 +32,7 @@ jobs:
       TFC_token_secret_name: PUBLIC_ACTIVE_ACTIVE_TFC_TOKEN
 
   private_active_active:
-    uses: hashicorp/terraform-random-tfe-utility/.github/workflows/google-tests.yml@ah/tf-8611-gcp-fdo-3
+    uses: hashicorp/terraform-random-tfe-utility/.github/workflows/google-tests.yml@main
     secrets: inherit
     name: Private Active/Active
     if: ${{ github.event.client_payload.slash_command.args.unnamed.all == 'all' || github.event.client_payload.slash_command.args.unnamed.all == 'private-active-active' }}
@@ -51,7 +51,7 @@ jobs:
       private_test: true
 
   private_tcp_active_active:
-    uses: hashicorp/terraform-random-tfe-utility/.github/workflows/google-tests.yml@ah/tf-8611-gcp-fdo-3
+    uses: hashicorp/terraform-random-tfe-utility/.github/workflows/google-tests.yml@main
     secrets: inherit
     name: Private TCP Active/Active
     if: ${{ github.event.client_payload.slash_command.args.unnamed.all == 'all' || github.event.client_payload.slash_command.args.unnamed.all == 'private-tcp-active-active' }}
@@ -70,7 +70,7 @@ jobs:
       private_test: true
 
   standalone_external_rhel8_worker:
-    uses: hashicorp/terraform-random-tfe-utility/.github/workflows/google-tests.yml@ah/tf-8611-gcp-fdo-3
+    uses: hashicorp/terraform-random-tfe-utility/.github/workflows/google-tests.yml@main
     secrets: inherit
     name: Standalone External Rhel8 Worker
     if: ${{ github.event.client_payload.slash_command.args.unnamed.all == 'all' || github.event.client_payload.slash_command.args.unnamed.all == 'standalone-external-rhel8-worker' }}
@@ -96,7 +96,7 @@ jobs:
         }\n/'
 
   standalone_mounted_disk:
-    uses: hashicorp/terraform-random-tfe-utility/.github/workflows/google-tests.yml@ah/tf-8611-gcp-fdo-3
+    uses: hashicorp/terraform-random-tfe-utility/.github/workflows/google-tests.yml@main
     secrets: inherit
     name: Standalone Mounted Disk
     if: ${{ github.event.client_payload.slash_command.args.unnamed.all == 'all' || github.event.client_payload.slash_command.args.unnamed.all == 'standalone-mounted-disk' }}
@@ -122,7 +122,7 @@ jobs:
         }\n/'
 
   public_active_active_replicated:
-    uses: hashicorp/terraform-random-tfe-utility/.github/workflows/google-tests.yml@ah/tf-8611-gcp-fdo-3
+    uses: hashicorp/terraform-random-tfe-utility/.github/workflows/google-tests.yml@main
     secrets: inherit
     name: Public Active/Active
     if: ${{ github.event.client_payload.slash_command.args.unnamed.all == 'all' || github.event.client_payload.slash_command.args.unnamed.all == 'public-active-active-replicated' }}
@@ -142,7 +142,7 @@ jobs:
       TFC_workspace_substitution_pattern: s/google-public-active-active/google-public-active-active-replicated/
 
   private_active_active_replicated:
-    uses: hashicorp/terraform-random-tfe-utility/.github/workflows/google-tests.yml@ah/tf-8611-gcp-fdo-3
+    uses: hashicorp/terraform-random-tfe-utility/.github/workflows/google-tests.yml@main
     secrets: inherit
     name: Private Active/Active
     if: ${{ github.event.client_payload.slash_command.args.unnamed.all == 'all' || github.event.client_payload.slash_command.args.unnamed.all == 'private-active-active-replicated'}}
@@ -162,7 +162,7 @@ jobs:
       private_test: true
 
   private_tcp_active_active_replicated:
-    uses: hashicorp/terraform-random-tfe-utility/.github/workflows/google-tests.yml@ah/tf-8611-gcp-fdo-3
+    uses: hashicorp/terraform-random-tfe-utility/.github/workflows/google-tests.yml@main
     secrets: inherit
     name: Private TCP Active/Active
     if: ${{ github.event.client_payload.slash_command.args.unnamed.all == 'all' || github.event.client_payload.slash_command.args.unnamed.all == 'private-tcp-active-active-replicated' }}
@@ -182,7 +182,7 @@ jobs:
       private_test: true
 
   standalone_external_rhel8_worker_replicated:
-    uses: hashicorp/terraform-random-tfe-utility/.github/workflows/google-tests.yml@ah/tf-8611-gcp-fdo-3
+    uses: hashicorp/terraform-random-tfe-utility/.github/workflows/google-tests.yml@main
     secrets: inherit
     name: Standalone External Rhel8 Worker
     if: ${{ github.event.client_payload.slash_command.args.unnamed.all == 'all' || github.event.client_payload.slash_command.args.unnamed.all == 'standalone-external-rhel8-worker-replicated'}}
@@ -208,7 +208,7 @@ jobs:
         }\n/'
 
   standalone_mounted_disk_replicated:
-    uses: hashicorp/terraform-random-tfe-utility/.github/workflows/google-tests.yml@ah/tf-8611-gcp-fdo-3
+    uses: hashicorp/terraform-random-tfe-utility/.github/workflows/google-tests.yml@main
     secrets: inherit
     name: Standalone Mounted Disk
     if: ${{ github.event.client_payload.slash_command.args.unnamed.all == 'all' || github.event.client_payload.slash_command.args.unnamed.all == 'standalone-mounted-disk-replicated' }}

diff --git a/main.tf b/main.tf
@@ -108,7 +108,7 @@ module "redis" {
 # Docker Compose File Config for TFE on instance(s) using Flexible Deployment Options
 # ------------------------------------------------------------------------------------
 module "docker_compose_config" {
-  source = "git::https://github.com/hashicorp/terraform-random-tfe-utility//modules/docker_compose_config?ref=ah/tf-8611-gcp-fdo-3"
+  source = "git::https://github.com/hashicorp/terraform-random-tfe-utility//modules/docker_compose_config?ref=main"
   count  = var.is_replicated_deployment ? 0 : 1
 
   license_reporting_opt_out = var.license_reporting_opt_out
@@ -164,7 +164,7 @@ module "docker_compose_config" {
 # User data / cloud init used to install and configure TFE on instance(s) using Flexible Deployment Options
 # ----------------------------------------------------------------------------------------------------------
 module "tfe_init_fdo" {
-  source = "git::https://github.com/hashicorp/terraform-random-tfe-utility//modules/tfe_init?ref=ah/tf-8611-gcp-fdo-3"
+  source = "git::https://github.com/hashicorp/terraform-random-tfe-utility//modules/tfe_init?ref=main"
   count  = var.is_replicated_deployment ? 0 : 1
 
   cloud             = "google"
@@ -192,7 +192,7 @@ module "tfe_init_fdo" {
 # TFE and Replicated settings to pass to the tfe_init_replicated module
 # -----------------------------------------------------------------------------
 module "settings" {
-  source = "git::https://github.com/hashicorp/terraform-random-tfe-utility//modules/settings?ref=ah/tf-8611-gcp-fdo-3"
+  source = "git::https://github.com/hashicorp/terraform-random-tfe-utility//modules/settings?ref=main"
   count  = var.is_replicated_deployment ? 1 : 0
 
   # TFE Base Configuration
@@ -260,7 +260,7 @@ module "settings" {
 # User data / cloud init used to install and configure TFE on instance(s) via Replicated
 # ---------------------------------------------------------------------------------------
 module "tfe_init_replicated" {
-  source = "git::https://github.com/hashicorp/terraform-random-tfe-utility//modules/tfe_init_replicated?ref=ah/tf-8611-gcp-fdo-3"
+  source = "git::https://github.com/hashicorp/terraform-random-tfe-utility//modules/tfe_init_replicated?ref=main"
   count  = var.is_replicated_deployment ? 1 : 0
 
   # TFE & Replicated Configuration data