Skip to content

Commit

Permalink
revert refs to main
Browse files Browse the repository at this point in the history
  • Loading branch information
anniehedgpeth committed Sep 21, 2023
1 parent cd6ca34 commit f398ea1
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 24 deletions.
20 changes: 10 additions & 10 deletions .github/workflows/handler-destroy.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ env:

jobs:
active_active_rhel7_proxy:
uses: hashicorp/terraform-random-tfe-utility/.github/workflows/destroy.yml@ah/tf-5370
uses: hashicorp/terraform-random-tfe-utility/.github/workflows/destroy.yml@main
secrets: inherit
name: Destroy resources from AWS Active/Active RHEL7 Proxy
if: ${{ contains(github.event.client_payload.slash_command.args.unnamed.all, 'all') || contains(github.event.client_payload.slash_command.args.unnamed.all, 'active-active-rhel7-proxy') }}
Expand All @@ -34,7 +34,7 @@ jobs:
}\n/'

public_active_active:
uses: hashicorp/terraform-random-tfe-utility/.github/workflows/destroy.yml@ah/tf-5370
uses: hashicorp/terraform-random-tfe-utility/.github/workflows/destroy.yml@main
secrets: inherit
name: Destroy resources from AWS Public Active/Active
if: ${{ contains(github.event.client_payload.slash_command.args.unnamed.all, 'all') || contains(github.event.client_payload.slash_command.args.unnamed.all, 'public-active-active') }}
Expand All @@ -51,7 +51,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-5370
uses: hashicorp/terraform-random-tfe-utility/.github/workflows/destroy.yml@main
secrets: inherit
name: Destroy resources from AWS Private Active/Active
if: ${{ contains(github.event.client_payload.slash_command.args.unnamed.all, 'all') || contains(github.event.client_payload.slash_command.args.unnamed.all, 'private-active-active') }}
Expand All @@ -68,7 +68,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-5370
uses: hashicorp/terraform-random-tfe-utility/.github/workflows/destroy.yml@main
secrets: inherit
name: Destroy resources from AWS Private TCP Active/Active
if: ${{ contains(github.event.client_payload.slash_command.args.unnamed.all, 'all') || contains(github.event.client_payload.slash_command.args.unnamed.all, 'private-tcp-active-active') }}
Expand All @@ -85,7 +85,7 @@ jobs:
TFC_token_secret_name: PRIVATE_TCP_ACTIVE_ACTIVE_TFC_TOKEN

standalone_vault:
uses: hashicorp/terraform-random-tfe-utility/.github/workflows/destroy.yml@ah/tf-5370
uses: hashicorp/terraform-random-tfe-utility/.github/workflows/destroy.yml@main
secrets: inherit
name: Destroy resources from AWS Standalone Vault
if: ${{ contains(github.event.client_payload.slash_command.args.unnamed.all, 'all') || contains(github.event.client_payload.slash_command.args.unnamed.all, 'standalone-vault') }}
Expand All @@ -109,7 +109,7 @@ jobs:
}\n/'

active_active_rhel7_proxy_legacy:
uses: hashicorp/terraform-random-tfe-utility/.github/workflows/destroy.yml@ah/tf-5370
uses: hashicorp/terraform-random-tfe-utility/.github/workflows/destroy.yml@main
secrets: inherit
name: Destroy resources from AWS Active/Active RHEL7 Proxy (Legacy)
if: ${{ contains(github.event.client_payload.slash_command.args.unnamed.all, 'all') || contains(github.event.client_payload.slash_command.args.unnamed.all, 'active-active-rhel7-proxy-legacy') }}
Expand All @@ -133,7 +133,7 @@ jobs:
}\n/'

public_active_active_legacy:
uses: hashicorp/terraform-random-tfe-utility/.github/workflows/destroy.yml@ah/tf-5370
uses: hashicorp/terraform-random-tfe-utility/.github/workflows/destroy.yml@main
secrets: inherit
name: Destroy resources from AWS Public Active/Active (Legacy)
if: ${{ contains(github.event.client_payload.slash_command.args.unnamed.all, 'all') || contains(github.event.client_payload.slash_command.args.unnamed.all, 'public-active-active-legacy') }}
Expand All @@ -151,7 +151,7 @@ jobs:
TFC_workspace_substitution_pattern: s/aws-public-active-active/aws-public-active-active-legacy/

private_active_active_legacy:
uses: hashicorp/terraform-random-tfe-utility/.github/workflows/destroy.yml@ah/tf-5370
uses: hashicorp/terraform-random-tfe-utility/.github/workflows/destroy.yml@main
secrets: inherit
name: Destroy resources from AWS Private Active/Active (Legacy)
if: ${{ contains(github.event.client_payload.slash_command.args.unnamed.all, 'all') || contains(github.event.client_payload.slash_command.args.unnamed.all, 'private-active-active-legacy') }}
Expand All @@ -169,7 +169,7 @@ jobs:
TFC_workspace_substitution_pattern: s/aws-private-active-active/aws-private-active-active-legacy/

private_tcp_active_active_legacy:
uses: hashicorp/terraform-random-tfe-utility/.github/workflows/destroy.yml@ah/tf-5370
uses: hashicorp/terraform-random-tfe-utility/.github/workflows/destroy.yml@main
secrets: inherit
name: Destroy resources from AWS Private TCP Active/Active (Legacy)
if: ${{ contains(github.event.client_payload.slash_command.args.unnamed.all, 'all') || contains(github.event.client_payload.slash_command.args.unnamed.all, 'private-tcp-active-active-legacy') }}
Expand All @@ -187,7 +187,7 @@ jobs:
TFC_workspace_substitution_pattern: s/aws-private-tcp-active-active/aws-private-tcp-active-active-legacy/

standalone_vault_legacy:
uses: hashicorp/terraform-random-tfe-utility/.github/workflows/destroy.yml@ah/tf-5370
uses: hashicorp/terraform-random-tfe-utility/.github/workflows/destroy.yml@main
secrets: inherit
name: Destroy resources from AWS Standalone Vault (Legacy)
if: ${{ contains(github.event.client_payload.slash_command.args.unnamed.all, 'all') || contains(github.event.client_payload.slash_command.args.unnamed.all, 'public-active-active-legacy') }}
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/handler-test.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ env:

jobs:
active_active_rhel7_proxy:
uses: hashicorp/terraform-random-tfe-utility/.github/workflows/aws-tests.yml@ah/tf-5370
uses: hashicorp/terraform-random-tfe-utility/.github/workflows/aws-tests.yml@main
secrets: inherit
name: Test AWS Active/Active RHEL7 Proxy Scenario
if: ${{ contains(github.event.client_payload.slash_command.args.unnamed.all, 'all') || contains(github.event.client_payload.slash_command.args.unnamed.all, 'active-active-rhel7-proxy') }}
Expand All @@ -34,7 +34,7 @@ jobs:
}\n/'

public_active_active:
uses: hashicorp/terraform-random-tfe-utility/.github/workflows/aws-tests.yml@ah/tf-5370
uses: hashicorp/terraform-random-tfe-utility/.github/workflows/aws-tests.yml@main
secrets: inherit
name: Test AWS Public Active/Active Scenario
if: ${{ contains(github.event.client_payload.slash_command.args.unnamed.all, 'all') || contains(github.event.client_payload.slash_command.args.unnamed.all, 'public-active-active') }}
Expand All @@ -51,7 +51,7 @@ jobs:
TFC_token_secret_name: PUBLIC_ACTIVE_ACTIVE_TFC_TOKEN

private_active_active:
uses: hashicorp/terraform-random-tfe-utility/.github/workflows/aws-tests.yml@ah/tf-5370
uses: hashicorp/terraform-random-tfe-utility/.github/workflows/aws-tests.yml@main
secrets: inherit
name: Test AWS Private Active/Active Scenario
if: ${{ contains(github.event.client_payload.slash_command.args.unnamed.all, 'all') || contains(github.event.client_payload.slash_command.args.unnamed.all, 'private-active-active') }}
Expand All @@ -68,7 +68,7 @@ jobs:
TFC_token_secret_name: PRIVATE_ACTIVE_ACTIVE_TFC_TOKEN

private_tcp_active_active:
uses: hashicorp/terraform-random-tfe-utility/.github/workflows/aws-tests.yml@ah/tf-5370
uses: hashicorp/terraform-random-tfe-utility/.github/workflows/aws-tests.yml@main
secrets: inherit
name: Test AWS Private TCP Active/Active Scenario
if: ${{ contains(github.event.client_payload.slash_command.args.unnamed.all, 'all') || contains(github.event.client_payload.slash_command.args.unnamed.all, 'private-tcp-active-active') }}
Expand All @@ -85,7 +85,7 @@ jobs:
TFC_token_secret_name: PRIVATE_TCP_ACTIVE_ACTIVE_TFC_TOKEN

standalone_vault:
uses: hashicorp/terraform-random-tfe-utility/.github/workflows/aws-tests.yml@ah/tf-5370
uses: hashicorp/terraform-random-tfe-utility/.github/workflows/aws-tests.yml@main
secrets: inherit
name: Test AWS Standalone Vault Scenario
if: ${{ contains(github.event.client_payload.slash_command.args.unnamed.all, 'all') || contains(github.event.client_payload.slash_command.args.unnamed.all, 'standalone-vault') }}
Expand All @@ -110,7 +110,7 @@ jobs:
}\n/'

active_active_rhel7_proxy_legacy:
uses: hashicorp/terraform-random-tfe-utility/.github/workflows/aws-tests.yml@ah/tf-5370
uses: hashicorp/terraform-random-tfe-utility/.github/workflows/aws-tests.yml@main
secrets: inherit
name: Test AWS Active/Active RHEL7 Proxy (Legacy) Scenario
if: ${{ contains(github.event.client_payload.slash_command.args.unnamed.all, 'all') || contains(github.event.client_payload.slash_command.args.unnamed.all, 'active-active-rhel7-proxy-legacy') }}
Expand All @@ -134,7 +134,7 @@ jobs:
}\n/'

public_active_active_legacy:
uses: hashicorp/terraform-random-tfe-utility/.github/workflows/aws-tests.yml@ah/tf-5370
uses: hashicorp/terraform-random-tfe-utility/.github/workflows/aws-tests.yml@main
secrets: inherit
name: Test AWS Public Active/Active (Legacy) Scenario
if: ${{ contains(github.event.client_payload.slash_command.args.unnamed.all, 'all') || contains(github.event.client_payload.slash_command.args.unnamed.all, 'public-active-active-legacy') }}
Expand All @@ -152,7 +152,7 @@ jobs:
TFC_workspace_substitution_pattern: s/aws-public-active-active/aws-public-active-active-legacy/

private_active_active_legacy:
uses: hashicorp/terraform-random-tfe-utility/.github/workflows/aws-tests.yml@ah/tf-5370
uses: hashicorp/terraform-random-tfe-utility/.github/workflows/aws-tests.yml@main
secrets: inherit
name: Test AWS Private Active/Active (Legacy) Scenario
if: ${{ contains(github.event.client_payload.slash_command.args.unnamed.all, 'all') || contains(github.event.client_payload.slash_command.args.unnamed.all, 'private-active-active-legacy') }}
Expand All @@ -170,7 +170,7 @@ jobs:
TFC_workspace_substitution_pattern: s/aws-private-active-active/aws-private-active-active-legacy/

private_tcp_active_active_legacy:
uses: hashicorp/terraform-random-tfe-utility/.github/workflows/aws-tests.yml@ah/tf-5370
uses: hashicorp/terraform-random-tfe-utility/.github/workflows/aws-tests.yml@main
secrets: inherit
name: Test AWS Private TCP Active/Active (Legacy) Scenario
if: ${{ contains(github.event.client_payload.slash_command.args.unnamed.all, 'all') || contains(github.event.client_payload.slash_command.args.unnamed.all, 'private-tcp-active-active-legacy') }}
Expand All @@ -188,7 +188,7 @@ jobs:
TFC_workspace_substitution_pattern: s/aws-private-tcp-active-active/aws-private-tcp-active-active-legacy/

standalone_vault_legacy:
uses: hashicorp/terraform-random-tfe-utility/.github/workflows/aws-tests.yml@ah/tf-5370
uses: hashicorp/terraform-random-tfe-utility/.github/workflows/aws-tests.yml@main
secrets: inherit
name: Test AWS Standalone Vault (Legacy) Scenario
if: ${{ contains(github.event.client_payload.slash_command.args.unnamed.all, 'all') || contains(github.event.client_payload.slash_command.args.unnamed.all, 'public-active-active-legacy') }}
Expand Down
8 changes: 4 additions & 4 deletions main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ module "database" {
# 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-5370"
source = "git::https://github.com/hashicorp/terraform-random-tfe-utility//modules/docker_compose_config?ref=main"
count = var.is_legacy_deployment ? 0 : 1

hostname = local.fqdn
Expand Down Expand Up @@ -167,7 +167,7 @@ module "docker_compose_config" {
# AWS 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-5370"
source = "git::https://github.com/hashicorp/terraform-random-tfe-utility//modules/tfe_init?ref=main"
count = var.is_legacy_deployment ? 0 : 1

cloud = "aws"
Expand Down Expand Up @@ -203,7 +203,7 @@ module "tfe_init_fdo" {
# TFE and Replicated settings to pass to the tfe_init_legacy module for legacy deployment
# ----------------------------------------------------------------------------------------
module "settings" {
source = "git::https://github.com/hashicorp/terraform-random-tfe-utility//modules/settings?ref=ah/tf-5370"
source = "git::https://github.com/hashicorp/terraform-random-tfe-utility//modules/settings?ref=main"
count = var.is_legacy_deployment ? 1 : 0

# TFE Base Configuration
Expand Down Expand Up @@ -274,7 +274,7 @@ module "settings" {
# AWS user data / cloud init used to install and configure TFE on instance(s)
# -----------------------------------------------------------------------------
module "tfe_init_legacy" {
source = "git::https://github.com/hashicorp/terraform-random-tfe-utility//modules/tfe_init_legacy?ref=ah/tf-5370"
source = "git::https://github.com/hashicorp/terraform-random-tfe-utility//modules/tfe_init_legacy?ref=main"
count = var.is_legacy_deployment ? 1 : 0

# TFE & Replicated Configuration data
Expand Down

0 comments on commit f398ea1

Please sign in to comment.