Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,6 @@ jobs:
id: terraform-destroy
run: |
ENTERPRISE_ID=$(jq -r '.enterprise_id' $CONFIG_FILE)
DEPLOYMENT_ID=$(jq -r '.deployment_id' $CONFIG_FILE)
terraform init -backend-config="bucket=$TERRAFORM_BACKEND_S3_BUCKET" -backend-config="key=$ENTERPRISE_ID/aws/$DEPLOYMENT_ID/ingress.tfstate" -backend-config="region=$TF_VAR_aws_region"
INGRESS_ID=$(jq -r '.ingress_id' $CONFIG_FILE)
terraform init -backend-config="bucket=$TERRAFORM_BACKEND_S3_BUCKET" -backend-config="key=$ENTERPRISE_ID/aws/$INGRESS_ID/ingress.tfstate" -backend-config="region=$TF_VAR_aws_region"
terraform destroy -var-file $CONFIG_FILE -auto-approve
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ jobs:
id: terraform-init
run: |
ENTERPRISE_ID=$(jq -r '.enterprise_id' $CONFIG_FILE)
DEPLOYMENT_ID=$(jq -r '.deployment_id' $CONFIG_FILE)
terraform init -backend-config="bucket=$TERRAFORM_BACKEND_S3_BUCKET" -backend-config="key=$ENTERPRISE_ID/aws/$DEPLOYMENT_ID/ingress.tfstate" -backend-config="region=$TF_VAR_aws_region"
INGRESS_ID=$(jq -r '.ingress_id' $CONFIG_FILE)
terraform init -backend-config="bucket=$TERRAFORM_BACKEND_S3_BUCKET" -backend-config="key=$ENTERPRISE_ID/aws/$INGRESS_ID/ingress.tfstate" -backend-config="region=$TF_VAR_aws_region"
- name: Terraform Apply
id: terraform-apply
if: github.event.inputs.terraform_command != 'plan'
Expand Down
1 change: 1 addition & 0 deletions aws/iam-policies/ArcGISEnterpriseCore.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
"sns:GetSubscriptionAttributes",
"sns:ListTagsForResource",
"sns:SetTopicAttributes",
"sns:Subscribe",
"sns:TagResource"
],
"Resource": "*"
Expand Down
3 changes: 2 additions & 1 deletion aws/iam-policies/ArcGISEnterpriseCoreDestroy.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
"sns:DeleteTopic",
"sns:GetTopicAttributes",
"sns:GetSubscriptionAttributes",
"sns:ListTagsForResource"
"sns:ListTagsForResource",
"sns:Unsubscribe"
],
"Resource": "*"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@ jobs:
id: terraform-init
run: |
ENTERPRISE_ID=$(jq -r '.enterprise_id' $CONFIG_FILE)
DEPLOYMENT_ID=$(jq -r '.deployment_id' $CONFIG_FILE)
INGRESS_ID=$(jq -r '.ingress_id' $CONFIG_FILE)
terraform init -backend-config="storage_account_name=$TERRAFORM_BACKEND_STORAGE_ACCOUNT_NAME" \
-backend-config="container_name=$TERRAFORM_BACKEND_CONTAINER_NAME" \
-backend-config="key=$ENTERPRISE_ID/azure/$DEPLOYMENT_ID/ingress.tfstate"
-backend-config="key=$ENTERPRISE_ID/azure/$INGRESS_ID/ingress.tfstate"
- name: Terraform Destroy
id: terraform-destroy
run: terraform destroy -var-file $CONFIG_FILE -auto-approve -input=false
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,10 @@ jobs:
id: terraform-init
run: |
ENTERPRISE_ID=$(jq -r '.enterprise_id' $CONFIG_FILE)
DEPLOYMENT_ID=$(jq -r '.deployment_id' $CONFIG_FILE)
INGRESS_ID=$(jq -r '.ingress_id' $CONFIG_FILE)
terraform init -backend-config="storage_account_name=$TERRAFORM_BACKEND_STORAGE_ACCOUNT_NAME" \
-backend-config="container_name=$TERRAFORM_BACKEND_CONTAINER_NAME" \
-backend-config="key=$ENTERPRISE_ID/azure/$DEPLOYMENT_ID/ingress.tfstate"
-backend-config="key=$ENTERPRISE_ID/azure/$INGRESS_ID/ingress.tfstate"
- name: Terraform Apply
id: terraform-apply
if: github.event.inputs.terraform_command != 'plan'
Expand Down