diff --git a/.github/workflows/deploy-enterprise.yml b/.github/workflows/deploy-enterprise.yml index 74fd1d6fe..479fc6ccc 100644 --- a/.github/workflows/deploy-enterprise.yml +++ b/.github/workflows/deploy-enterprise.yml @@ -212,25 +212,6 @@ jobs: ami_id: /aws/service/ecs/optimized-ami/amazon-linux-2023/recommended/image_id distribution_url: '' - - environment: hyp3-pdc - domain: hyp3-pdc.asf.alaska.edu - template_bucket: cf-templates-tlsr0tnnqt5t-us-west-2 - image_tag: latest - # TODO product lifetime could be much shorter since they all get transferred to a separate - # S3 bucket, but maybe we want to allow for a backlog of products-to-be-transferred? - product_lifetime_in_days: 14 - default_credits_per_user: 0 - default_application_status: APPROVED - cost_profile: DEFAULT - job_files: job_spec/WATER_MAP.yml - instance_types: r6id.xlarge,r6id.2xlarge,r6id.4xlarge,r6id.8xlarge,r6idn.xlarge,r6idn.2xlarge,r6idn.4xlarge,r6idn.8xlarge - default_max_vcpus: 640 - expanded_max_vcpus: 640 - required_surplus: 0 - security_environment: ASF - ami_id: /aws/service/ecs/optimized-ami/amazon-linux-2023/recommended/image_id - distribution_url: '' - - environment: hyp3-lavas domain: hyp3-lavas.asf.alaska.edu template_bucket: cf-templates-10a5pjrsv3cgo-us-west-2 diff --git a/CHANGELOG.md b/CHANGELOG.md index 1a0d16cd6..202e929cc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,15 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [7.9.2] + +### Removed +- Deleted the `hyp3-pdc` deployment in preparation for archiving the [hyp3-flood-monitoring](https://github.com/ASFHyP3/hyp3-flood-monitoring) project. + +### Fixed +- Copied cloudformation permissions from user to cloudformation deployment role in ASF-deployment-ci-cf.yml to address + breaking AWS IAM change when deploying nested stacks via a cloudformation role. + ## [7.9.1] ### Changed diff --git a/docs/deployments/ASF-deployment-ci-cf.yml b/docs/deployments/ASF-deployment-ci-cf.yml index 4de1f5e65..d7c54e0ed 100644 --- a/docs/deployments/ASF-deployment-ci-cf.yml +++ b/docs/deployments/ASF-deployment-ci-cf.yml @@ -42,6 +42,18 @@ Resources: - kms:* Resource: "*" + - Effect: Allow + Action: + - cloudformation:SetStackPolicy + - cloudformation:CreateStack + - cloudformation:UpdateStack + - cloudformation:CreateChangeSet + - cloudformation:DescribeChangeSet + - cloudformation:ExecuteChangeSet + - cloudformation:DeleteChangeSet + - cloudformation:GetTemplateSummary + Resource: !Sub "arn:aws:cloudformation:${AWS::Region}:${AWS::AccountId}:stack/*" + GithubActionsUser: Type: AWS::IAM::User Properties: