diff --git a/.github/workflows/terraform-deploy-data-qa-dev.yml b/.github/workflows/terraform-deploy-data-qa-dev.yml index 2b6d310..70e0724 100644 --- a/.github/workflows/terraform-deploy-data-qa-dev.yml +++ b/.github/workflows/terraform-deploy-data-qa-dev.yml @@ -11,9 +11,12 @@ on: required: true default: 'main' TerraformTarget: - description: 'Terraform Target, please provide resource target name' + type: choice + description: 'Terraform Target, please provide target env name' required: true - default: 'all' + options: + - data_qa + - data_qa_intg jobs: terraform: @@ -57,21 +60,11 @@ jobs: if: ${{ github.event.inputs.applyTerraform == 'plan' }} run: | cd $TF_DIR - if [ ${{ github.event.inputs.TerraformTarget }} = "all" ] - then - terraform plan -input=false - else - terraform plan -target=${{ github.event.inputs.TerraformTarget }} -input=false - fi + terraform plan -target=module.${{ github.event.inputs.TerraformTarget }} -input=false - name: Terraform apply id: apply if: ${{ github.event.inputs.applyTerraform == 'apply' }} run: | cd $TF_DIR - if [ ${{ github.event.inputs.TerraformTarget }} = "all" ] - then - terraform apply -auto-approve - else - terraform apply -auto-approve -target=${{ github.event.inputs.TerraformTarget }} - fi + terraform apply -auto-approve -target=module.${{ github.event.inputs.TerraformTarget }} diff --git a/examples/basic/main.tf b/examples/basic/main.tf index 87e8a1d..07bed54 100644 --- a/examples/basic/main.tf +++ b/examples/basic/main.tf @@ -24,12 +24,28 @@ module "data_qa" { source = "../../terraform" cloudfront_allowed_subnets = ["255.255.255.255/32"] - data_test_storage_bucket_name = "dqg-settings" + data_test_storage_bucket_name = "dqg-settings-dev" environment = "demo" project = "provectus" allure_report_image_uri = module.docker_image_allure_report.image_uri data_test_image_uri = module.docker_image_data_test.image_uri push_report_image_uri = module.docker_image_push_report.image_uri + + web_acl_id = "arn:aws:wafv2:us-east-1:024975173233:global/webacl/demo-provectus-web-acl/c4517afa-629f-41ab-a4b9-a9645eb9b8dc" } +module "data_qa_intg" { + source = "../../terraform" + cloudfront_allowed_subnets = ["255.255.255.255/32"] + + data_test_storage_bucket_name = "dqg-settings-intg" + environment = "intg" + project = "provectus" + + allure_report_image_uri = module.docker_image_allure_report.image_uri + data_test_image_uri = module.docker_image_data_test.image_uri + push_report_image_uri = module.docker_image_push_report.image_uri + + web_acl_id = "arn:aws:wafv2:us-east-1:024975173233:global/webacl/demo-provectus-web-acl/c4517afa-629f-41ab-a4b9-a9645eb9b8dc" +} diff --git a/examples/basic/variables.tf b/examples/basic/variables.tf new file mode 100644 index 0000000..e69de29