diff --git a/.github/workflows/terraform-standard-iac-pipeline-account-matrix.yaml b/.github/workflows/terraform-standard-iac-pipeline-account-matrix.yaml index ccc7b475..9d6390d3 100644 --- a/.github/workflows/terraform-standard-iac-pipeline-account-matrix.yaml +++ b/.github/workflows/terraform-standard-iac-pipeline-account-matrix.yaml @@ -3,8 +3,8 @@ name: Terraform Standard - IAC Pipeline (Account/VPC Matrix) on: push: paths: - - 'iac-template/terraform-standard/envs/dev-vpc/**' - - 'iac-template/terraform-standard/envs/dev-role/**' + - 'iac-template/terraform-hcl-standard/aws-cloud/envs/dev-vpc/**' + - 'iac-template/terraform-hcl-standard/aws-cloud/envs/dev-role/**' - '.github/workflows/terraform-standard-iac-pipeline-account-matrix.yaml' workflow_dispatch: inputs: @@ -14,7 +14,7 @@ on: default: 'true' env: - BASE_DIR: iac-template/terraform-standard/envs + BASE_DIR: iac-template/terraform-hcl-standard/aws-cloud/envs AWS_REGION: ap-northeast-1 DRY_RUN: ${{ github.event.inputs.dry_run || 'true' }} diff --git a/.github/workflows/terraform-standard-iac-pipeline-aws-global-bootstrap.yaml b/.github/workflows/terraform-standard-iac-pipeline-aws-global-bootstrap.yaml index 9d17fcba..6009611a 100644 --- a/.github/workflows/terraform-standard-iac-pipeline-aws-global-bootstrap.yaml +++ b/.github/workflows/terraform-standard-iac-pipeline-aws-global-bootstrap.yaml @@ -3,7 +3,9 @@ name: Terraform Standard - AWS Account Bootstrap on: push: paths: - - 'iac-template/terraform-standard/**' + - 'iac-template/terraform-hcl-standard/aws-cloud/bootstrap-s3/**' + - 'iac-template/terraform-hcl-standard/aws-cloud/bootstrap-iam/**' + - 'iac-template/terraform-hcl-standard/aws-cloud/bootstrap-dynamodb/**' - '.github/workflows/terraform-standard-iac-pipeline-aws-global-bootstrap.yaml' pull_request: workflow_dispatch: @@ -18,7 +20,7 @@ on: default: 'true' env: - TF_WORKDIR: iac-template/terraform-standard + TF_WORKDIR: iac-template/terraform-hcl-standard/aws-cloud DRY_RUN: ${{ github.event.inputs.deploy_dry_run || 'true' }} jobs: diff --git a/.github/workflows/terraform-standard-iac-pipeline-aws-global-landingzone-baseline.yaml b/.github/workflows/terraform-standard-iac-pipeline-aws-global-landingzone-baseline.yaml index 7743f7f1..9285071c 100644 --- a/.github/workflows/terraform-standard-iac-pipeline-aws-global-landingzone-baseline.yaml +++ b/.github/workflows/terraform-standard-iac-pipeline-aws-global-landingzone-baseline.yaml @@ -3,7 +3,7 @@ name: Terraform Standard - AWS Global LandingZone Baseline on: push: paths: - - 'iac-template/terraform-standard/**' + - 'iac-template/terraform-hcl-standard/aws-cloud/**' - '.github/workflows/terraform-standard-iac-pipeline-aws-global-landingzone-baseline.yaml' pull_request: branches: [main] @@ -12,7 +12,7 @@ on: deploy_action: description: "Deployment action" type: choice - options: [init, plan, apply, destroy] + options: [plan, apply, destroy] default: plan deploy_dry_run: description: "Dry-run mode" @@ -21,9 +21,8 @@ on: default: 'true' env: - TF_WORKDIR: iac-template/terraform-standard + TF_WORKDIR: iac-template/terraform-hcl-standard/aws-cloud DEPLOY_ACTION: ${{ github.event.inputs.deploy_action || 'plan' }} - DEPLOY_DRY_RUN: ${{ github.event.inputs.deploy_dry_run || 'true' }} # ------------------------------- # SMTP settings (明文可接受) @@ -62,6 +61,7 @@ jobs: - name: Terraform Plan (LandingZone) id: tfplan + if: env.DEPLOY_ACTION == 'plan' working-directory: ${{ env.TF_WORKDIR }}/envs/dev-landingzone run: terraform plan -no-color > plan_output.txt @@ -72,7 +72,7 @@ jobs: path: ${{ env.TF_WORKDIR }}/envs/dev-landingzone/plan_output.txt - name: Terraform Apply (LandingZone) - if: env.DEPLOY_DRY_RUN == 'false' + if: env.DEPLOY_ACTION == 'apply' working-directory: ${{ env.TF_WORKDIR }}/envs/dev-landingzone run: terraform apply -auto-approve diff --git a/.github/workflows/terraform-standard-iac-pipeline-resources-matrix.yaml b/.github/workflows/terraform-standard-iac-pipeline-resources-matrix.yaml index c47d249c..35bf11fc 100644 --- a/.github/workflows/terraform-standard-iac-pipeline-resources-matrix.yaml +++ b/.github/workflows/terraform-standard-iac-pipeline-resources-matrix.yaml @@ -3,8 +3,8 @@ name: Terraform Standard - IAC Pipeline (Resources Matrix) on: push: paths: - - 'iac-template/terraform-standard/envs/dev-object/**' - - 'iac-template/terraform-standard/envs/dev-ec2/**' + - 'iac-template/terraform-hcl-standard/aws-cloud/envs/dev-object/**' + - 'iac-template/terraform-hcl-standard/aws-cloud/envs/dev-ec2/**' - '.github/workflows/terraform-standard-iac-pipeline-resources-matrix.yaml' workflow_dispatch: inputs: @@ -14,7 +14,7 @@ on: default: 'true' env: - BASE_DIR: iac-template/terraform-standard/envs + BASE_DIR: iac-template/terraform-hcl-standard/aws-cloud/envs AWS_REGION: ap-northeast-1 DRY_RUN: ${{ github.event.inputs.dry_run || 'true' }} diff --git a/iac-template/terraform-standard/Makefile b/iac-template/terraform-hcl-standard/Makefile similarity index 100% rename from iac-template/terraform-standard/Makefile rename to iac-template/terraform-hcl-standard/Makefile diff --git a/iac-template/terraform-standard/README.md b/iac-template/terraform-hcl-standard/aws-cloud/README.md similarity index 100% rename from iac-template/terraform-standard/README.md rename to iac-template/terraform-hcl-standard/aws-cloud/README.md diff --git a/iac-template/terraform-standard/bootstrap-dynamodb/.gitignore b/iac-template/terraform-hcl-standard/aws-cloud/bootstrap-dynamodb/.gitignore similarity index 100% rename from iac-template/terraform-standard/bootstrap-dynamodb/.gitignore rename to iac-template/terraform-hcl-standard/aws-cloud/bootstrap-dynamodb/.gitignore diff --git a/iac-template/terraform-standard/bootstrap-dynamodb/Makefile b/iac-template/terraform-hcl-standard/aws-cloud/bootstrap-dynamodb/Makefile similarity index 100% rename from iac-template/terraform-standard/bootstrap-dynamodb/Makefile rename to iac-template/terraform-hcl-standard/aws-cloud/bootstrap-dynamodb/Makefile diff --git a/iac-template/terraform-standard/bootstrap-dynamodb/main.tf b/iac-template/terraform-hcl-standard/aws-cloud/bootstrap-dynamodb/main.tf similarity index 100% rename from iac-template/terraform-standard/bootstrap-dynamodb/main.tf rename to iac-template/terraform-hcl-standard/aws-cloud/bootstrap-dynamodb/main.tf diff --git a/iac-template/terraform-standard/bootstrap-dynamodb/outputs.tf b/iac-template/terraform-hcl-standard/aws-cloud/bootstrap-dynamodb/outputs.tf similarity index 100% rename from iac-template/terraform-standard/bootstrap-dynamodb/outputs.tf rename to iac-template/terraform-hcl-standard/aws-cloud/bootstrap-dynamodb/outputs.tf diff --git a/iac-template/terraform-standard/bootstrap-dynamodb/provider.tf b/iac-template/terraform-hcl-standard/aws-cloud/bootstrap-dynamodb/provider.tf similarity index 100% rename from iac-template/terraform-standard/bootstrap-dynamodb/provider.tf rename to iac-template/terraform-hcl-standard/aws-cloud/bootstrap-dynamodb/provider.tf diff --git a/iac-template/terraform-standard/bootstrap-dynamodb/variables.tf b/iac-template/terraform-hcl-standard/aws-cloud/bootstrap-dynamodb/variables.tf similarity index 100% rename from iac-template/terraform-standard/bootstrap-dynamodb/variables.tf rename to iac-template/terraform-hcl-standard/aws-cloud/bootstrap-dynamodb/variables.tf diff --git a/iac-template/terraform-standard/bootstrap-iam/.gitignore b/iac-template/terraform-hcl-standard/aws-cloud/bootstrap-iam/.gitignore similarity index 100% rename from iac-template/terraform-standard/bootstrap-iam/.gitignore rename to iac-template/terraform-hcl-standard/aws-cloud/bootstrap-iam/.gitignore diff --git a/iac-template/terraform-standard/bootstrap-iam/Makefile b/iac-template/terraform-hcl-standard/aws-cloud/bootstrap-iam/Makefile similarity index 100% rename from iac-template/terraform-standard/bootstrap-iam/Makefile rename to iac-template/terraform-hcl-standard/aws-cloud/bootstrap-iam/Makefile diff --git a/iac-template/terraform-standard/bootstrap-iam/main.tf b/iac-template/terraform-hcl-standard/aws-cloud/bootstrap-iam/main.tf similarity index 100% rename from iac-template/terraform-standard/bootstrap-iam/main.tf rename to iac-template/terraform-hcl-standard/aws-cloud/bootstrap-iam/main.tf diff --git a/iac-template/terraform-standard/bootstrap-iam/outputs.tf b/iac-template/terraform-hcl-standard/aws-cloud/bootstrap-iam/outputs.tf similarity index 100% rename from iac-template/terraform-standard/bootstrap-iam/outputs.tf rename to iac-template/terraform-hcl-standard/aws-cloud/bootstrap-iam/outputs.tf diff --git a/iac-template/terraform-standard/bootstrap-iam/provider.tf b/iac-template/terraform-hcl-standard/aws-cloud/bootstrap-iam/provider.tf similarity index 100% rename from iac-template/terraform-standard/bootstrap-iam/provider.tf rename to iac-template/terraform-hcl-standard/aws-cloud/bootstrap-iam/provider.tf diff --git a/iac-template/terraform-standard/bootstrap-iam/variables.tf b/iac-template/terraform-hcl-standard/aws-cloud/bootstrap-iam/variables.tf similarity index 100% rename from iac-template/terraform-standard/bootstrap-iam/variables.tf rename to iac-template/terraform-hcl-standard/aws-cloud/bootstrap-iam/variables.tf diff --git a/iac-template/terraform-standard/bootstrap-s3/... b/iac-template/terraform-hcl-standard/aws-cloud/bootstrap-s3/... similarity index 100% rename from iac-template/terraform-standard/bootstrap-s3/... rename to iac-template/terraform-hcl-standard/aws-cloud/bootstrap-s3/... diff --git a/iac-template/terraform-standard/bootstrap-s3/.gitignore b/iac-template/terraform-hcl-standard/aws-cloud/bootstrap-s3/.gitignore similarity index 100% rename from iac-template/terraform-standard/bootstrap-s3/.gitignore rename to iac-template/terraform-hcl-standard/aws-cloud/bootstrap-s3/.gitignore diff --git a/iac-template/terraform-standard/bootstrap-s3/Makefile b/iac-template/terraform-hcl-standard/aws-cloud/bootstrap-s3/Makefile similarity index 100% rename from iac-template/terraform-standard/bootstrap-s3/Makefile rename to iac-template/terraform-hcl-standard/aws-cloud/bootstrap-s3/Makefile diff --git a/iac-template/terraform-standard/bootstrap-s3/main.tf b/iac-template/terraform-hcl-standard/aws-cloud/bootstrap-s3/main.tf similarity index 100% rename from iac-template/terraform-standard/bootstrap-s3/main.tf rename to iac-template/terraform-hcl-standard/aws-cloud/bootstrap-s3/main.tf diff --git a/iac-template/terraform-standard/bootstrap-s3/outputs.tf b/iac-template/terraform-hcl-standard/aws-cloud/bootstrap-s3/outputs.tf similarity index 100% rename from iac-template/terraform-standard/bootstrap-s3/outputs.tf rename to iac-template/terraform-hcl-standard/aws-cloud/bootstrap-s3/outputs.tf diff --git a/iac-template/terraform-standard/bootstrap-s3/provider.tf b/iac-template/terraform-hcl-standard/aws-cloud/bootstrap-s3/provider.tf similarity index 100% rename from iac-template/terraform-standard/bootstrap-s3/provider.tf rename to iac-template/terraform-hcl-standard/aws-cloud/bootstrap-s3/provider.tf diff --git a/iac-template/terraform-standard/bootstrap-s3/variables.tf b/iac-template/terraform-hcl-standard/aws-cloud/bootstrap-s3/variables.tf similarity index 100% rename from iac-template/terraform-standard/bootstrap-s3/variables.tf rename to iac-template/terraform-hcl-standard/aws-cloud/bootstrap-s3/variables.tf diff --git a/iac-template/terraform-standard/config/accounts/dev-landingzone.yaml b/iac-template/terraform-hcl-standard/aws-cloud/config/accounts/dev-landingzone.yaml similarity index 100% rename from iac-template/terraform-standard/config/accounts/dev-landingzone.yaml rename to iac-template/terraform-hcl-standard/aws-cloud/config/accounts/dev-landingzone.yaml diff --git a/iac-template/terraform-standard/config/accounts/dev.yaml b/iac-template/terraform-hcl-standard/aws-cloud/config/accounts/dev.yaml similarity index 100% rename from iac-template/terraform-standard/config/accounts/dev.yaml rename to iac-template/terraform-hcl-standard/aws-cloud/config/accounts/dev.yaml diff --git a/iac-template/terraform-standard/config/resources/dev-alb/alb.yaml b/iac-template/terraform-hcl-standard/aws-cloud/config/resources/dev-alb/alb.yaml similarity index 100% rename from iac-template/terraform-standard/config/resources/dev-alb/alb.yaml rename to iac-template/terraform-hcl-standard/aws-cloud/config/resources/dev-alb/alb.yaml diff --git a/iac-template/terraform-standard/config/resources/dev-kafka/msk.yaml b/iac-template/terraform-hcl-standard/aws-cloud/config/resources/dev-kafka/msk.yaml similarity index 100% rename from iac-template/terraform-standard/config/resources/dev-kafka/msk.yaml rename to iac-template/terraform-hcl-standard/aws-cloud/config/resources/dev-kafka/msk.yaml diff --git a/iac-template/terraform-standard/config/resources/dev-nlb/nlb.yaml b/iac-template/terraform-hcl-standard/aws-cloud/config/resources/dev-nlb/nlb.yaml similarity index 100% rename from iac-template/terraform-standard/config/resources/dev-nlb/nlb.yaml rename to iac-template/terraform-hcl-standard/aws-cloud/config/resources/dev-nlb/nlb.yaml diff --git a/iac-template/terraform-standard/config/resources/dev-object/bucket.yaml b/iac-template/terraform-hcl-standard/aws-cloud/config/resources/dev-object/bucket.yaml similarity index 100% rename from iac-template/terraform-standard/config/resources/dev-object/bucket.yaml rename to iac-template/terraform-hcl-standard/aws-cloud/config/resources/dev-object/bucket.yaml diff --git a/iac-template/terraform-standard/config/resources/dev-rds/rds.yaml b/iac-template/terraform-hcl-standard/aws-cloud/config/resources/dev-rds/rds.yaml similarity index 100% rename from iac-template/terraform-standard/config/resources/dev-rds/rds.yaml rename to iac-template/terraform-hcl-standard/aws-cloud/config/resources/dev-rds/rds.yaml diff --git a/iac-template/terraform-standard/config/resources/dev-redis/redis.yaml b/iac-template/terraform-hcl-standard/aws-cloud/config/resources/dev-redis/redis.yaml similarity index 100% rename from iac-template/terraform-standard/config/resources/dev-redis/redis.yaml rename to iac-template/terraform-hcl-standard/aws-cloud/config/resources/dev-redis/redis.yaml diff --git a/iac-template/terraform-standard/config/resources/ec2/dev.yaml b/iac-template/terraform-hcl-standard/aws-cloud/config/resources/ec2/dev.yaml similarity index 100% rename from iac-template/terraform-standard/config/resources/ec2/dev.yaml rename to iac-template/terraform-hcl-standard/aws-cloud/config/resources/ec2/dev.yaml diff --git a/iac-template/terraform-standard/config/resources/vpc/dev.yaml b/iac-template/terraform-hcl-standard/aws-cloud/config/resources/vpc/dev.yaml similarity index 100% rename from iac-template/terraform-standard/config/resources/vpc/dev.yaml rename to iac-template/terraform-hcl-standard/aws-cloud/config/resources/vpc/dev.yaml diff --git a/iac-template/terraform-standard/envs/dev-alb/backend.tf b/iac-template/terraform-hcl-standard/aws-cloud/envs/dev-alb/backend.tf similarity index 100% rename from iac-template/terraform-standard/envs/dev-alb/backend.tf rename to iac-template/terraform-hcl-standard/aws-cloud/envs/dev-alb/backend.tf diff --git a/iac-template/terraform-standard/envs/dev-alb/main.tf b/iac-template/terraform-hcl-standard/aws-cloud/envs/dev-alb/main.tf similarity index 100% rename from iac-template/terraform-standard/envs/dev-alb/main.tf rename to iac-template/terraform-hcl-standard/aws-cloud/envs/dev-alb/main.tf diff --git a/iac-template/terraform-standard/envs/dev-alb/outputs.tf b/iac-template/terraform-hcl-standard/aws-cloud/envs/dev-alb/outputs.tf similarity index 100% rename from iac-template/terraform-standard/envs/dev-alb/outputs.tf rename to iac-template/terraform-hcl-standard/aws-cloud/envs/dev-alb/outputs.tf diff --git a/iac-template/terraform-standard/envs/dev-alb/provider.tf b/iac-template/terraform-hcl-standard/aws-cloud/envs/dev-alb/provider.tf similarity index 100% rename from iac-template/terraform-standard/envs/dev-alb/provider.tf rename to iac-template/terraform-hcl-standard/aws-cloud/envs/dev-alb/provider.tf diff --git a/iac-template/terraform-standard/envs/dev-ec2/.gitignore b/iac-template/terraform-hcl-standard/aws-cloud/envs/dev-ec2/.gitignore similarity index 100% rename from iac-template/terraform-standard/envs/dev-ec2/.gitignore rename to iac-template/terraform-hcl-standard/aws-cloud/envs/dev-ec2/.gitignore diff --git a/iac-template/terraform-standard/envs/dev-ec2/Makefile b/iac-template/terraform-hcl-standard/aws-cloud/envs/dev-ec2/Makefile similarity index 100% rename from iac-template/terraform-standard/envs/dev-ec2/Makefile rename to iac-template/terraform-hcl-standard/aws-cloud/envs/dev-ec2/Makefile diff --git a/iac-template/terraform-standard/envs/dev-ec2/backend.tf b/iac-template/terraform-hcl-standard/aws-cloud/envs/dev-ec2/backend.tf similarity index 100% rename from iac-template/terraform-standard/envs/dev-ec2/backend.tf rename to iac-template/terraform-hcl-standard/aws-cloud/envs/dev-ec2/backend.tf diff --git a/iac-template/terraform-standard/envs/dev-ec2/main.tf b/iac-template/terraform-hcl-standard/aws-cloud/envs/dev-ec2/main.tf similarity index 100% rename from iac-template/terraform-standard/envs/dev-ec2/main.tf rename to iac-template/terraform-hcl-standard/aws-cloud/envs/dev-ec2/main.tf diff --git a/iac-template/terraform-standard/envs/dev-ec2/outputs.tf b/iac-template/terraform-hcl-standard/aws-cloud/envs/dev-ec2/outputs.tf similarity index 100% rename from iac-template/terraform-standard/envs/dev-ec2/outputs.tf rename to iac-template/terraform-hcl-standard/aws-cloud/envs/dev-ec2/outputs.tf diff --git a/iac-template/terraform-standard/envs/dev-ec2/provider.tf b/iac-template/terraform-hcl-standard/aws-cloud/envs/dev-ec2/provider.tf similarity index 100% rename from iac-template/terraform-standard/envs/dev-ec2/provider.tf rename to iac-template/terraform-hcl-standard/aws-cloud/envs/dev-ec2/provider.tf diff --git a/iac-template/terraform-standard/envs/dev-kafka/.gitignore b/iac-template/terraform-hcl-standard/aws-cloud/envs/dev-kafka/.gitignore similarity index 100% rename from iac-template/terraform-standard/envs/dev-kafka/.gitignore rename to iac-template/terraform-hcl-standard/aws-cloud/envs/dev-kafka/.gitignore diff --git a/iac-template/terraform-standard/envs/dev-kafka/Makefile b/iac-template/terraform-hcl-standard/aws-cloud/envs/dev-kafka/Makefile similarity index 100% rename from iac-template/terraform-standard/envs/dev-kafka/Makefile rename to iac-template/terraform-hcl-standard/aws-cloud/envs/dev-kafka/Makefile diff --git a/iac-template/terraform-standard/envs/dev-kafka/backend.tf b/iac-template/terraform-hcl-standard/aws-cloud/envs/dev-kafka/backend.tf similarity index 100% rename from iac-template/terraform-standard/envs/dev-kafka/backend.tf rename to iac-template/terraform-hcl-standard/aws-cloud/envs/dev-kafka/backend.tf diff --git a/iac-template/terraform-standard/envs/dev-kafka/main.tf b/iac-template/terraform-hcl-standard/aws-cloud/envs/dev-kafka/main.tf similarity index 100% rename from iac-template/terraform-standard/envs/dev-kafka/main.tf rename to iac-template/terraform-hcl-standard/aws-cloud/envs/dev-kafka/main.tf diff --git a/iac-template/terraform-standard/envs/dev-kafka/outputs.tf b/iac-template/terraform-hcl-standard/aws-cloud/envs/dev-kafka/outputs.tf similarity index 100% rename from iac-template/terraform-standard/envs/dev-kafka/outputs.tf rename to iac-template/terraform-hcl-standard/aws-cloud/envs/dev-kafka/outputs.tf diff --git a/iac-template/terraform-standard/envs/dev-kafka/provider.tf b/iac-template/terraform-hcl-standard/aws-cloud/envs/dev-kafka/provider.tf similarity index 100% rename from iac-template/terraform-standard/envs/dev-kafka/provider.tf rename to iac-template/terraform-hcl-standard/aws-cloud/envs/dev-kafka/provider.tf diff --git a/iac-template/terraform-standard/envs/dev-landingzone/.gitignore b/iac-template/terraform-hcl-standard/aws-cloud/envs/dev-landingzone/.gitignore similarity index 100% rename from iac-template/terraform-standard/envs/dev-landingzone/.gitignore rename to iac-template/terraform-hcl-standard/aws-cloud/envs/dev-landingzone/.gitignore diff --git a/iac-template/terraform-standard/envs/dev-landingzone/Makefile b/iac-template/terraform-hcl-standard/aws-cloud/envs/dev-landingzone/Makefile similarity index 100% rename from iac-template/terraform-standard/envs/dev-landingzone/Makefile rename to iac-template/terraform-hcl-standard/aws-cloud/envs/dev-landingzone/Makefile diff --git a/iac-template/terraform-standard/envs/dev-landingzone/backend.tf b/iac-template/terraform-hcl-standard/aws-cloud/envs/dev-landingzone/backend.tf similarity index 100% rename from iac-template/terraform-standard/envs/dev-landingzone/backend.tf rename to iac-template/terraform-hcl-standard/aws-cloud/envs/dev-landingzone/backend.tf diff --git a/iac-template/terraform-standard/envs/dev-landingzone/main.tf b/iac-template/terraform-hcl-standard/aws-cloud/envs/dev-landingzone/main.tf similarity index 100% rename from iac-template/terraform-standard/envs/dev-landingzone/main.tf rename to iac-template/terraform-hcl-standard/aws-cloud/envs/dev-landingzone/main.tf diff --git a/iac-template/terraform-standard/envs/dev-landingzone/provider.tf b/iac-template/terraform-hcl-standard/aws-cloud/envs/dev-landingzone/provider.tf similarity index 100% rename from iac-template/terraform-standard/envs/dev-landingzone/provider.tf rename to iac-template/terraform-hcl-standard/aws-cloud/envs/dev-landingzone/provider.tf diff --git a/iac-template/terraform-standard/envs/dev-nlb/backend.tf b/iac-template/terraform-hcl-standard/aws-cloud/envs/dev-nlb/backend.tf similarity index 100% rename from iac-template/terraform-standard/envs/dev-nlb/backend.tf rename to iac-template/terraform-hcl-standard/aws-cloud/envs/dev-nlb/backend.tf diff --git a/iac-template/terraform-standard/envs/dev-nlb/main.tf b/iac-template/terraform-hcl-standard/aws-cloud/envs/dev-nlb/main.tf similarity index 100% rename from iac-template/terraform-standard/envs/dev-nlb/main.tf rename to iac-template/terraform-hcl-standard/aws-cloud/envs/dev-nlb/main.tf diff --git a/iac-template/terraform-standard/envs/dev-nlb/outputs.tf b/iac-template/terraform-hcl-standard/aws-cloud/envs/dev-nlb/outputs.tf similarity index 100% rename from iac-template/terraform-standard/envs/dev-nlb/outputs.tf rename to iac-template/terraform-hcl-standard/aws-cloud/envs/dev-nlb/outputs.tf diff --git a/iac-template/terraform-standard/envs/dev-nlb/provider.tf b/iac-template/terraform-hcl-standard/aws-cloud/envs/dev-nlb/provider.tf similarity index 100% rename from iac-template/terraform-standard/envs/dev-nlb/provider.tf rename to iac-template/terraform-hcl-standard/aws-cloud/envs/dev-nlb/provider.tf diff --git a/iac-template/terraform-standard/envs/dev-object/.gitignore b/iac-template/terraform-hcl-standard/aws-cloud/envs/dev-object/.gitignore similarity index 100% rename from iac-template/terraform-standard/envs/dev-object/.gitignore rename to iac-template/terraform-hcl-standard/aws-cloud/envs/dev-object/.gitignore diff --git a/iac-template/terraform-standard/envs/dev-object/Makefile b/iac-template/terraform-hcl-standard/aws-cloud/envs/dev-object/Makefile similarity index 100% rename from iac-template/terraform-standard/envs/dev-object/Makefile rename to iac-template/terraform-hcl-standard/aws-cloud/envs/dev-object/Makefile diff --git a/iac-template/terraform-standard/envs/dev-object/backend.tf b/iac-template/terraform-hcl-standard/aws-cloud/envs/dev-object/backend.tf similarity index 100% rename from iac-template/terraform-standard/envs/dev-object/backend.tf rename to iac-template/terraform-hcl-standard/aws-cloud/envs/dev-object/backend.tf diff --git a/iac-template/terraform-standard/envs/dev-object/main.tf b/iac-template/terraform-hcl-standard/aws-cloud/envs/dev-object/main.tf similarity index 100% rename from iac-template/terraform-standard/envs/dev-object/main.tf rename to iac-template/terraform-hcl-standard/aws-cloud/envs/dev-object/main.tf diff --git a/iac-template/terraform-standard/envs/dev-object/outputs.tf b/iac-template/terraform-hcl-standard/aws-cloud/envs/dev-object/outputs.tf similarity index 100% rename from iac-template/terraform-standard/envs/dev-object/outputs.tf rename to iac-template/terraform-hcl-standard/aws-cloud/envs/dev-object/outputs.tf diff --git a/iac-template/terraform-standard/envs/dev-object/provider.tf b/iac-template/terraform-hcl-standard/aws-cloud/envs/dev-object/provider.tf similarity index 100% rename from iac-template/terraform-standard/envs/dev-object/provider.tf rename to iac-template/terraform-hcl-standard/aws-cloud/envs/dev-object/provider.tf diff --git a/iac-template/terraform-standard/envs/dev-rds/.terraform.lock.hcl b/iac-template/terraform-hcl-standard/aws-cloud/envs/dev-rds/.terraform.lock.hcl similarity index 100% rename from iac-template/terraform-standard/envs/dev-rds/.terraform.lock.hcl rename to iac-template/terraform-hcl-standard/aws-cloud/envs/dev-rds/.terraform.lock.hcl diff --git a/iac-template/terraform-standard/envs/dev-rds/Makefile b/iac-template/terraform-hcl-standard/aws-cloud/envs/dev-rds/Makefile similarity index 100% rename from iac-template/terraform-standard/envs/dev-rds/Makefile rename to iac-template/terraform-hcl-standard/aws-cloud/envs/dev-rds/Makefile diff --git a/iac-template/terraform-standard/envs/dev-rds/main.tf b/iac-template/terraform-hcl-standard/aws-cloud/envs/dev-rds/main.tf similarity index 100% rename from iac-template/terraform-standard/envs/dev-rds/main.tf rename to iac-template/terraform-hcl-standard/aws-cloud/envs/dev-rds/main.tf diff --git a/iac-template/terraform-standard/envs/dev-rds/outputs.tf b/iac-template/terraform-hcl-standard/aws-cloud/envs/dev-rds/outputs.tf similarity index 100% rename from iac-template/terraform-standard/envs/dev-rds/outputs.tf rename to iac-template/terraform-hcl-standard/aws-cloud/envs/dev-rds/outputs.tf diff --git a/iac-template/terraform-standard/envs/dev-rds/provider.tf b/iac-template/terraform-hcl-standard/aws-cloud/envs/dev-rds/provider.tf similarity index 100% rename from iac-template/terraform-standard/envs/dev-rds/provider.tf rename to iac-template/terraform-hcl-standard/aws-cloud/envs/dev-rds/provider.tf diff --git a/iac-template/terraform-standard/envs/dev-redis/backend.tf b/iac-template/terraform-hcl-standard/aws-cloud/envs/dev-redis/backend.tf similarity index 100% rename from iac-template/terraform-standard/envs/dev-redis/backend.tf rename to iac-template/terraform-hcl-standard/aws-cloud/envs/dev-redis/backend.tf diff --git a/iac-template/terraform-standard/envs/dev-redis/main.tf b/iac-template/terraform-hcl-standard/aws-cloud/envs/dev-redis/main.tf similarity index 100% rename from iac-template/terraform-standard/envs/dev-redis/main.tf rename to iac-template/terraform-hcl-standard/aws-cloud/envs/dev-redis/main.tf diff --git a/iac-template/terraform-standard/envs/dev-redis/outputs.tf b/iac-template/terraform-hcl-standard/aws-cloud/envs/dev-redis/outputs.tf similarity index 100% rename from iac-template/terraform-standard/envs/dev-redis/outputs.tf rename to iac-template/terraform-hcl-standard/aws-cloud/envs/dev-redis/outputs.tf diff --git a/iac-template/terraform-standard/envs/dev-redis/provider.tf b/iac-template/terraform-hcl-standard/aws-cloud/envs/dev-redis/provider.tf similarity index 100% rename from iac-template/terraform-standard/envs/dev-redis/provider.tf rename to iac-template/terraform-hcl-standard/aws-cloud/envs/dev-redis/provider.tf diff --git a/iac-template/terraform-standard/envs/dev-role/.gitignore b/iac-template/terraform-hcl-standard/aws-cloud/envs/dev-role/.gitignore similarity index 100% rename from iac-template/terraform-standard/envs/dev-role/.gitignore rename to iac-template/terraform-hcl-standard/aws-cloud/envs/dev-role/.gitignore diff --git a/iac-template/terraform-standard/envs/dev-role/Makefile b/iac-template/terraform-hcl-standard/aws-cloud/envs/dev-role/Makefile similarity index 100% rename from iac-template/terraform-standard/envs/dev-role/Makefile rename to iac-template/terraform-hcl-standard/aws-cloud/envs/dev-role/Makefile diff --git a/iac-template/terraform-standard/envs/dev-role/backend.tf b/iac-template/terraform-hcl-standard/aws-cloud/envs/dev-role/backend.tf similarity index 100% rename from iac-template/terraform-standard/envs/dev-role/backend.tf rename to iac-template/terraform-hcl-standard/aws-cloud/envs/dev-role/backend.tf diff --git a/iac-template/terraform-standard/envs/dev-role/main.tf b/iac-template/terraform-hcl-standard/aws-cloud/envs/dev-role/main.tf similarity index 100% rename from iac-template/terraform-standard/envs/dev-role/main.tf rename to iac-template/terraform-hcl-standard/aws-cloud/envs/dev-role/main.tf diff --git a/iac-template/terraform-standard/envs/dev-role/outputs.tf b/iac-template/terraform-hcl-standard/aws-cloud/envs/dev-role/outputs.tf similarity index 100% rename from iac-template/terraform-standard/envs/dev-role/outputs.tf rename to iac-template/terraform-hcl-standard/aws-cloud/envs/dev-role/outputs.tf diff --git a/iac-template/terraform-standard/envs/dev-role/provider.tf b/iac-template/terraform-hcl-standard/aws-cloud/envs/dev-role/provider.tf similarity index 100% rename from iac-template/terraform-standard/envs/dev-role/provider.tf rename to iac-template/terraform-hcl-standard/aws-cloud/envs/dev-role/provider.tf diff --git a/iac-template/terraform-standard/envs/dev-vpc/.terraform.lock.hcl b/iac-template/terraform-hcl-standard/aws-cloud/envs/dev-vpc/.terraform.lock.hcl similarity index 100% rename from iac-template/terraform-standard/envs/dev-vpc/.terraform.lock.hcl rename to iac-template/terraform-hcl-standard/aws-cloud/envs/dev-vpc/.terraform.lock.hcl diff --git a/iac-template/terraform-standard/envs/dev-vpc/Makefile b/iac-template/terraform-hcl-standard/aws-cloud/envs/dev-vpc/Makefile similarity index 100% rename from iac-template/terraform-standard/envs/dev-vpc/Makefile rename to iac-template/terraform-hcl-standard/aws-cloud/envs/dev-vpc/Makefile diff --git a/iac-template/terraform-standard/envs/dev-vpc/README.md b/iac-template/terraform-hcl-standard/aws-cloud/envs/dev-vpc/README.md similarity index 100% rename from iac-template/terraform-standard/envs/dev-vpc/README.md rename to iac-template/terraform-hcl-standard/aws-cloud/envs/dev-vpc/README.md diff --git a/iac-template/terraform-standard/envs/dev-vpc/backend.tf b/iac-template/terraform-hcl-standard/aws-cloud/envs/dev-vpc/backend.tf similarity index 100% rename from iac-template/terraform-standard/envs/dev-vpc/backend.tf rename to iac-template/terraform-hcl-standard/aws-cloud/envs/dev-vpc/backend.tf diff --git a/iac-template/terraform-standard/envs/dev-vpc/main.tf b/iac-template/terraform-hcl-standard/aws-cloud/envs/dev-vpc/main.tf similarity index 100% rename from iac-template/terraform-standard/envs/dev-vpc/main.tf rename to iac-template/terraform-hcl-standard/aws-cloud/envs/dev-vpc/main.tf diff --git a/iac-template/terraform-standard/envs/dev-vpc/outputs.tf b/iac-template/terraform-hcl-standard/aws-cloud/envs/dev-vpc/outputs.tf similarity index 100% rename from iac-template/terraform-standard/envs/dev-vpc/outputs.tf rename to iac-template/terraform-hcl-standard/aws-cloud/envs/dev-vpc/outputs.tf diff --git a/iac-template/terraform-standard/envs/dev-vpc/provider.tf b/iac-template/terraform-hcl-standard/aws-cloud/envs/dev-vpc/provider.tf similarity index 100% rename from iac-template/terraform-standard/envs/dev-vpc/provider.tf rename to iac-template/terraform-hcl-standard/aws-cloud/envs/dev-vpc/provider.tf diff --git a/iac-template/terraform-standard/modules/alb/main.tf b/iac-template/terraform-hcl-standard/aws-cloud/modules/alb/main.tf similarity index 100% rename from iac-template/terraform-standard/modules/alb/main.tf rename to iac-template/terraform-hcl-standard/aws-cloud/modules/alb/main.tf diff --git a/iac-template/terraform-standard/modules/alb/outputs.tf b/iac-template/terraform-hcl-standard/aws-cloud/modules/alb/outputs.tf similarity index 100% rename from iac-template/terraform-standard/modules/alb/outputs.tf rename to iac-template/terraform-hcl-standard/aws-cloud/modules/alb/outputs.tf diff --git a/iac-template/terraform-standard/modules/alb/variables.tf b/iac-template/terraform-hcl-standard/aws-cloud/modules/alb/variables.tf similarity index 100% rename from iac-template/terraform-standard/modules/alb/variables.tf rename to iac-template/terraform-hcl-standard/aws-cloud/modules/alb/variables.tf diff --git a/iac-template/terraform-standard/modules/ami_lookup/main.tf b/iac-template/terraform-hcl-standard/aws-cloud/modules/ami_lookup/main.tf similarity index 100% rename from iac-template/terraform-standard/modules/ami_lookup/main.tf rename to iac-template/terraform-hcl-standard/aws-cloud/modules/ami_lookup/main.tf diff --git a/iac-template/terraform-standard/modules/ami_lookup/outputs.tf b/iac-template/terraform-hcl-standard/aws-cloud/modules/ami_lookup/outputs.tf similarity index 100% rename from iac-template/terraform-standard/modules/ami_lookup/outputs.tf rename to iac-template/terraform-hcl-standard/aws-cloud/modules/ami_lookup/outputs.tf diff --git a/iac-template/terraform-standard/modules/ami_lookup/variables.tf b/iac-template/terraform-hcl-standard/aws-cloud/modules/ami_lookup/variables.tf similarity index 100% rename from iac-template/terraform-standard/modules/ami_lookup/variables.tf rename to iac-template/terraform-hcl-standard/aws-cloud/modules/ami_lookup/variables.tf diff --git a/iac-template/terraform-standard/modules/ec2/main.tf b/iac-template/terraform-hcl-standard/aws-cloud/modules/ec2/main.tf similarity index 100% rename from iac-template/terraform-standard/modules/ec2/main.tf rename to iac-template/terraform-hcl-standard/aws-cloud/modules/ec2/main.tf diff --git a/iac-template/terraform-standard/modules/ec2/outputs.tf b/iac-template/terraform-hcl-standard/aws-cloud/modules/ec2/outputs.tf similarity index 100% rename from iac-template/terraform-standard/modules/ec2/outputs.tf rename to iac-template/terraform-hcl-standard/aws-cloud/modules/ec2/outputs.tf diff --git a/iac-template/terraform-standard/modules/ec2/variables.tf b/iac-template/terraform-hcl-standard/aws-cloud/modules/ec2/variables.tf similarity index 100% rename from iac-template/terraform-standard/modules/ec2/variables.tf rename to iac-template/terraform-hcl-standard/aws-cloud/modules/ec2/variables.tf diff --git a/iac-template/terraform-standard/modules/iam/.gitignore b/iac-template/terraform-hcl-standard/aws-cloud/modules/iam/.gitignore similarity index 100% rename from iac-template/terraform-standard/modules/iam/.gitignore rename to iac-template/terraform-hcl-standard/aws-cloud/modules/iam/.gitignore diff --git a/iac-template/terraform-standard/modules/iam/main.tf b/iac-template/terraform-hcl-standard/aws-cloud/modules/iam/main.tf similarity index 100% rename from iac-template/terraform-standard/modules/iam/main.tf rename to iac-template/terraform-hcl-standard/aws-cloud/modules/iam/main.tf diff --git a/iac-template/terraform-standard/modules/iam/outputs.tf b/iac-template/terraform-hcl-standard/aws-cloud/modules/iam/outputs.tf similarity index 100% rename from iac-template/terraform-standard/modules/iam/outputs.tf rename to iac-template/terraform-hcl-standard/aws-cloud/modules/iam/outputs.tf diff --git a/iac-template/terraform-standard/modules/iam/variables.tf b/iac-template/terraform-hcl-standard/aws-cloud/modules/iam/variables.tf similarity index 100% rename from iac-template/terraform-standard/modules/iam/variables.tf rename to iac-template/terraform-hcl-standard/aws-cloud/modules/iam/variables.tf diff --git a/iac-template/terraform-standard/modules/keypair/main.tf b/iac-template/terraform-hcl-standard/aws-cloud/modules/keypair/main.tf similarity index 100% rename from iac-template/terraform-standard/modules/keypair/main.tf rename to iac-template/terraform-hcl-standard/aws-cloud/modules/keypair/main.tf diff --git a/iac-template/terraform-standard/modules/keypair/outputs.tf b/iac-template/terraform-hcl-standard/aws-cloud/modules/keypair/outputs.tf similarity index 100% rename from iac-template/terraform-standard/modules/keypair/outputs.tf rename to iac-template/terraform-hcl-standard/aws-cloud/modules/keypair/outputs.tf diff --git a/iac-template/terraform-standard/modules/keypair/variables.tf b/iac-template/terraform-hcl-standard/aws-cloud/modules/keypair/variables.tf similarity index 100% rename from iac-template/terraform-standard/modules/keypair/variables.tf rename to iac-template/terraform-hcl-standard/aws-cloud/modules/keypair/variables.tf diff --git a/iac-template/terraform-standard/modules/landingzone/main.tf b/iac-template/terraform-hcl-standard/aws-cloud/modules/landingzone/main.tf similarity index 100% rename from iac-template/terraform-standard/modules/landingzone/main.tf rename to iac-template/terraform-hcl-standard/aws-cloud/modules/landingzone/main.tf diff --git a/iac-template/terraform-standard/modules/landingzone/outputs.tf b/iac-template/terraform-hcl-standard/aws-cloud/modules/landingzone/outputs.tf similarity index 100% rename from iac-template/terraform-standard/modules/landingzone/outputs.tf rename to iac-template/terraform-hcl-standard/aws-cloud/modules/landingzone/outputs.tf diff --git a/iac-template/terraform-standard/modules/landingzone/policies/deny-console-write.json b/iac-template/terraform-hcl-standard/aws-cloud/modules/landingzone/policies/deny-console-write.json similarity index 100% rename from iac-template/terraform-standard/modules/landingzone/policies/deny-console-write.json rename to iac-template/terraform-hcl-standard/aws-cloud/modules/landingzone/policies/deny-console-write.json diff --git a/iac-template/terraform-standard/modules/landingzone/policies/deny-no-mfa.json b/iac-template/terraform-hcl-standard/aws-cloud/modules/landingzone/policies/deny-no-mfa.json similarity index 100% rename from iac-template/terraform-standard/modules/landingzone/policies/deny-no-mfa.json rename to iac-template/terraform-hcl-standard/aws-cloud/modules/landingzone/policies/deny-no-mfa.json diff --git a/iac-template/terraform-standard/modules/landingzone/policies/deny-ri-sp.json b/iac-template/terraform-hcl-standard/aws-cloud/modules/landingzone/policies/deny-ri-sp.json similarity index 100% rename from iac-template/terraform-standard/modules/landingzone/policies/deny-ri-sp.json rename to iac-template/terraform-hcl-standard/aws-cloud/modules/landingzone/policies/deny-ri-sp.json diff --git a/iac-template/terraform-standard/modules/landingzone/policies/deny-root.json b/iac-template/terraform-hcl-standard/aws-cloud/modules/landingzone/policies/deny-root.json similarity index 100% rename from iac-template/terraform-standard/modules/landingzone/policies/deny-root.json rename to iac-template/terraform-hcl-standard/aws-cloud/modules/landingzone/policies/deny-root.json diff --git a/iac-template/terraform-standard/modules/landingzone/variables.tf b/iac-template/terraform-hcl-standard/aws-cloud/modules/landingzone/variables.tf similarity index 100% rename from iac-template/terraform-standard/modules/landingzone/variables.tf rename to iac-template/terraform-hcl-standard/aws-cloud/modules/landingzone/variables.tf diff --git a/iac-template/terraform-standard/modules/msk/main.tf b/iac-template/terraform-hcl-standard/aws-cloud/modules/msk/main.tf similarity index 100% rename from iac-template/terraform-standard/modules/msk/main.tf rename to iac-template/terraform-hcl-standard/aws-cloud/modules/msk/main.tf diff --git a/iac-template/terraform-standard/modules/msk/outputs.tf b/iac-template/terraform-hcl-standard/aws-cloud/modules/msk/outputs.tf similarity index 100% rename from iac-template/terraform-standard/modules/msk/outputs.tf rename to iac-template/terraform-hcl-standard/aws-cloud/modules/msk/outputs.tf diff --git a/iac-template/terraform-standard/modules/msk/variables.tf b/iac-template/terraform-hcl-standard/aws-cloud/modules/msk/variables.tf similarity index 100% rename from iac-template/terraform-standard/modules/msk/variables.tf rename to iac-template/terraform-hcl-standard/aws-cloud/modules/msk/variables.tf diff --git a/iac-template/terraform-standard/modules/nlb/main.tf b/iac-template/terraform-hcl-standard/aws-cloud/modules/nlb/main.tf similarity index 100% rename from iac-template/terraform-standard/modules/nlb/main.tf rename to iac-template/terraform-hcl-standard/aws-cloud/modules/nlb/main.tf diff --git a/iac-template/terraform-standard/modules/nlb/outputs.tf b/iac-template/terraform-hcl-standard/aws-cloud/modules/nlb/outputs.tf similarity index 100% rename from iac-template/terraform-standard/modules/nlb/outputs.tf rename to iac-template/terraform-hcl-standard/aws-cloud/modules/nlb/outputs.tf diff --git a/iac-template/terraform-standard/modules/nlb/variables.tf b/iac-template/terraform-hcl-standard/aws-cloud/modules/nlb/variables.tf similarity index 100% rename from iac-template/terraform-standard/modules/nlb/variables.tf rename to iac-template/terraform-hcl-standard/aws-cloud/modules/nlb/variables.tf diff --git a/iac-template/terraform-standard/modules/rds/main.tf b/iac-template/terraform-hcl-standard/aws-cloud/modules/rds/main.tf similarity index 100% rename from iac-template/terraform-standard/modules/rds/main.tf rename to iac-template/terraform-hcl-standard/aws-cloud/modules/rds/main.tf diff --git a/iac-template/terraform-standard/modules/rds/outputs.tf b/iac-template/terraform-hcl-standard/aws-cloud/modules/rds/outputs.tf similarity index 100% rename from iac-template/terraform-standard/modules/rds/outputs.tf rename to iac-template/terraform-hcl-standard/aws-cloud/modules/rds/outputs.tf diff --git a/iac-template/terraform-standard/modules/rds/variables.tf b/iac-template/terraform-hcl-standard/aws-cloud/modules/rds/variables.tf similarity index 100% rename from iac-template/terraform-standard/modules/rds/variables.tf rename to iac-template/terraform-hcl-standard/aws-cloud/modules/rds/variables.tf diff --git a/iac-template/terraform-standard/modules/redis/main.tf b/iac-template/terraform-hcl-standard/aws-cloud/modules/redis/main.tf similarity index 100% rename from iac-template/terraform-standard/modules/redis/main.tf rename to iac-template/terraform-hcl-standard/aws-cloud/modules/redis/main.tf diff --git a/iac-template/terraform-standard/modules/redis/outputs.tf b/iac-template/terraform-hcl-standard/aws-cloud/modules/redis/outputs.tf similarity index 100% rename from iac-template/terraform-standard/modules/redis/outputs.tf rename to iac-template/terraform-hcl-standard/aws-cloud/modules/redis/outputs.tf diff --git a/iac-template/terraform-standard/modules/redis/variables.tf b/iac-template/terraform-hcl-standard/aws-cloud/modules/redis/variables.tf similarity index 100% rename from iac-template/terraform-standard/modules/redis/variables.tf rename to iac-template/terraform-hcl-standard/aws-cloud/modules/redis/variables.tf diff --git a/iac-template/terraform-standard/modules/s3/main.tf b/iac-template/terraform-hcl-standard/aws-cloud/modules/s3/main.tf similarity index 100% rename from iac-template/terraform-standard/modules/s3/main.tf rename to iac-template/terraform-hcl-standard/aws-cloud/modules/s3/main.tf diff --git a/iac-template/terraform-standard/modules/s3/outputs.tf b/iac-template/terraform-hcl-standard/aws-cloud/modules/s3/outputs.tf similarity index 100% rename from iac-template/terraform-standard/modules/s3/outputs.tf rename to iac-template/terraform-hcl-standard/aws-cloud/modules/s3/outputs.tf diff --git a/iac-template/terraform-standard/modules/s3/variables.tf b/iac-template/terraform-hcl-standard/aws-cloud/modules/s3/variables.tf similarity index 100% rename from iac-template/terraform-standard/modules/s3/variables.tf rename to iac-template/terraform-hcl-standard/aws-cloud/modules/s3/variables.tf diff --git a/iac-template/terraform-standard/modules/sg/.gitignore b/iac-template/terraform-hcl-standard/aws-cloud/modules/sg/.gitignore similarity index 100% rename from iac-template/terraform-standard/modules/sg/.gitignore rename to iac-template/terraform-hcl-standard/aws-cloud/modules/sg/.gitignore diff --git a/iac-template/terraform-standard/modules/sg/main.tf b/iac-template/terraform-hcl-standard/aws-cloud/modules/sg/main.tf similarity index 100% rename from iac-template/terraform-standard/modules/sg/main.tf rename to iac-template/terraform-hcl-standard/aws-cloud/modules/sg/main.tf diff --git a/iac-template/terraform-standard/modules/sg/outputs.tf b/iac-template/terraform-hcl-standard/aws-cloud/modules/sg/outputs.tf similarity index 100% rename from iac-template/terraform-standard/modules/sg/outputs.tf rename to iac-template/terraform-hcl-standard/aws-cloud/modules/sg/outputs.tf diff --git a/iac-template/terraform-standard/modules/sg/variables.tf b/iac-template/terraform-hcl-standard/aws-cloud/modules/sg/variables.tf similarity index 100% rename from iac-template/terraform-standard/modules/sg/variables.tf rename to iac-template/terraform-hcl-standard/aws-cloud/modules/sg/variables.tf diff --git a/iac-template/terraform-standard/modules/vpc/main.tf b/iac-template/terraform-hcl-standard/aws-cloud/modules/vpc/main.tf similarity index 100% rename from iac-template/terraform-standard/modules/vpc/main.tf rename to iac-template/terraform-hcl-standard/aws-cloud/modules/vpc/main.tf diff --git a/iac-template/terraform-standard/modules/vpc/outputs.tf b/iac-template/terraform-hcl-standard/aws-cloud/modules/vpc/outputs.tf similarity index 100% rename from iac-template/terraform-standard/modules/vpc/outputs.tf rename to iac-template/terraform-hcl-standard/aws-cloud/modules/vpc/outputs.tf diff --git a/iac-template/terraform-standard/modules/vpc/variables.tf b/iac-template/terraform-hcl-standard/aws-cloud/modules/vpc/variables.tf similarity index 100% rename from iac-template/terraform-standard/modules/vpc/variables.tf rename to iac-template/terraform-hcl-standard/aws-cloud/modules/vpc/variables.tf