From 1a2aa9967af208429cf5acaa7dbf98a7bac98f4e Mon Sep 17 00:00:00 2001 From: Shubham Chaturvedi Date: Wed, 15 Jan 2025 14:07:35 -0800 Subject: [PATCH 1/2] fix: repo rename --- .../codebuild/release/release-prod.yml | 2 +- .../codebuild/release/release-staging.yml | 2 +- AwsEncryptionSDK/codebuild/release/sign.yml | 2 +- AwsEncryptionSDK/codebuild/release/test-prod.yml | 2 +- cfn/CI.yaml | 14 +++++++------- cfn/net/CB-Release.yml | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/AwsEncryptionSDK/codebuild/release/release-prod.yml b/AwsEncryptionSDK/codebuild/release/release-prod.yml index fd3e9d890..12b06afe1 100644 --- a/AwsEncryptionSDK/codebuild/release/release-prod.yml +++ b/AwsEncryptionSDK/codebuild/release/release-prod.yml @@ -27,7 +27,7 @@ phases: - unzip -qq dafny.zip && rm dafny.zip - export PATH="$PWD/dafny:$PATH" # Switch back to the main directory - - cd aws-encryption-sdk-dafny/AwsEncryptionSDK + - cd aws-encryption-sdk/AwsEncryptionSDK pre_build: commands: # UNIQUE_ID should be passed in as an environment variable. It is used to tie diff --git a/AwsEncryptionSDK/codebuild/release/release-staging.yml b/AwsEncryptionSDK/codebuild/release/release-staging.yml index 7f8bfb07c..914aecb9e 100644 --- a/AwsEncryptionSDK/codebuild/release/release-staging.yml +++ b/AwsEncryptionSDK/codebuild/release/release-staging.yml @@ -37,7 +37,7 @@ phases: - sudo apt update - sudo apt-get install mono-devel -y # Switch back to the main directory - - cd aws-encryption-sdk-dafny/AwsEncryptionSDK + - cd aws-encryption-sdk/AwsEncryptionSDK pre_build: commands: # UNIQUE_ID should be passed in as an environment variable. It is used to tie diff --git a/AwsEncryptionSDK/codebuild/release/sign.yml b/AwsEncryptionSDK/codebuild/release/sign.yml index 7a82ae678..5b30acdcc 100644 --- a/AwsEncryptionSDK/codebuild/release/sign.yml +++ b/AwsEncryptionSDK/codebuild/release/sign.yml @@ -12,7 +12,7 @@ phases: - unzip -qq dafny.zip && rm dafny.zip - export PATH="$PWD/dafny:$PATH" # Switch back to the main directory - - cd aws-encryption-sdk-dafny + - cd aws-encryption-sdk pre_build: commands: # UNIQUE_ID should be passed in as an environment variable. It is used to tie diff --git a/AwsEncryptionSDK/codebuild/release/test-prod.yml b/AwsEncryptionSDK/codebuild/release/test-prod.yml index a6fbfabb6..7f91d440b 100644 --- a/AwsEncryptionSDK/codebuild/release/test-prod.yml +++ b/AwsEncryptionSDK/codebuild/release/test-prod.yml @@ -24,7 +24,7 @@ phases: - sudo apt update - sudo apt-get install mono-devel -y # Switch back to the main directory - - cd aws-encryption-sdk-dafny/AwsEncryptionSDK + - cd aws-encryption-sdk/AwsEncryptionSDK pre_build: commands: - make transpile_net diff --git a/cfn/CI.yaml b/cfn/CI.yaml index abeca4f7a..a42681cb4 100644 --- a/cfn/CI.yaml +++ b/cfn/CI.yaml @@ -13,11 +13,11 @@ Parameters: ProjectName: Type: String Description: A prefix that will be applied to any names - Default: Public-ESDK-Dafny + Default: Public-ESDK GitHubRepo: Type: String Description: GitHub Repo that invokes CI - Default: aws/aws-encryption-sdk-dafny + Default: aws/aws-encryption-sdk Resources: GitHubCIRole: @@ -26,7 +26,7 @@ Resources: RoleName: !Sub "GitHub-CI-${ProjectName}-Role-${AWS::Region}" Description: "Access DDB, KMS, Resources for CI from GitHub" ManagedPolicyArns: - - "arn:aws:iam::370957321024:policy/ESDK-Dafny-DDB-ReadWriteDelete-us-west-2" + - "arn:aws:iam::370957321024:policy/ESDK-DDB-ReadWriteDelete-us-west-2" - "arn:aws:iam::370957321024:policy/Hierarchical-GitHub-KMS-Key-Policy" - "arn:aws:iam::370957321024:policy/KMS-Public-CMK-EncryptDecrypt-Key-Access" - "arn:aws:iam::370957321024:policy/RSA-GitHub-KMS-Key-Policy" @@ -69,12 +69,12 @@ Resources: "Statement": [ { "Effect": "Allow", - "Principal": { "AWS": "arn:aws:iam::370957321024:role/GitHub-CI-ESDK-Dafny-Role-us-west-2" }, + "Principal": { "AWS": "arn:aws:iam::370957321024:role/GitHub-CI-ESDK-Role-us-west-2" }, "Action": "sts:AssumeRole" }, { "Effect": "Allow", - "Principal": { "AWS": "arn:aws:iam::370957321024:role/GitHub-CI-Public-ESDK-Dafny-Role-us-west-2" }, + "Principal": { "AWS": "arn:aws:iam::370957321024:role/GitHub-CI-Public-ESDK-Role-us-west-2" }, "Action": "sts:AssumeRole" }, { @@ -111,12 +111,12 @@ Resources: "Statement": [ { "Effect": "Allow", - "Principal": { "AWS": "arn:aws:iam::370957321024:role/GitHub-CI-ESDK-Dafny-Role-us-west-2" }, + "Principal": { "AWS": "arn:aws:iam::370957321024:role/GitHub-CI-ESDK-Role-us-west-2" }, "Action": "sts:AssumeRole" }, { "Effect": "Allow", - "Principal": { "AWS": "arn:aws:iam::370957321024:role/GitHub-CI-Public-ESDK-Dafny-Role-us-west-2" }, + "Principal": { "AWS": "arn:aws:iam::370957321024:role/GitHub-CI-Public-ESDK-Role-us-west-2" }, "Action": "sts:AssumeRole" }, { diff --git a/cfn/net/CB-Release.yml b/cfn/net/CB-Release.yml index 29adc849b..e2588f677 100644 --- a/cfn/net/CB-Release.yml +++ b/cfn/net/CB-Release.yml @@ -14,7 +14,7 @@ Parameters: SourceLocation: Type: String Description: The https GitHub URL for the project - Default: "https://github.com/aws/aws-encryption-sdk-dafny.git" + Default: "https://github.com/aws/aws-encryption-sdk.git" NumberOfBuildsInBatch: Type: Number MaxValue: 100 @@ -108,7 +108,7 @@ Resources: { "Effect": "Allow", "Action": "sts:AssumeRole", - "Resource": "arn:aws:iam::370957321024:role/GitHub-CI-MPL-Dafny-Role-us-west-2" + "Resource": "arn:aws:iam::370957321024:role/GitHub-CI-MPL-Role-us-west-2" } ] } From 4447800297799ebe3eff0f83e305c7257259cd96 Mon Sep 17 00:00:00 2001 From: Shubham Chaturvedi Date: Wed, 15 Jan 2025 14:26:45 -0800 Subject: [PATCH 2/2] fix: repo rename --- cfn/CI.yaml | 12 ++++++------ cfn/net/CB-Release.yml | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cfn/CI.yaml b/cfn/CI.yaml index a42681cb4..497a1e10b 100644 --- a/cfn/CI.yaml +++ b/cfn/CI.yaml @@ -13,7 +13,7 @@ Parameters: ProjectName: Type: String Description: A prefix that will be applied to any names - Default: Public-ESDK + Default: Public-ESDK-Dafny GitHubRepo: Type: String Description: GitHub Repo that invokes CI @@ -26,7 +26,7 @@ Resources: RoleName: !Sub "GitHub-CI-${ProjectName}-Role-${AWS::Region}" Description: "Access DDB, KMS, Resources for CI from GitHub" ManagedPolicyArns: - - "arn:aws:iam::370957321024:policy/ESDK-DDB-ReadWriteDelete-us-west-2" + - "arn:aws:iam::370957321024:policy/ESDK-Dafny-DDB-ReadWriteDelete-us-west-2" - "arn:aws:iam::370957321024:policy/Hierarchical-GitHub-KMS-Key-Policy" - "arn:aws:iam::370957321024:policy/KMS-Public-CMK-EncryptDecrypt-Key-Access" - "arn:aws:iam::370957321024:policy/RSA-GitHub-KMS-Key-Policy" @@ -69,12 +69,12 @@ Resources: "Statement": [ { "Effect": "Allow", - "Principal": { "AWS": "arn:aws:iam::370957321024:role/GitHub-CI-ESDK-Role-us-west-2" }, + "Principal": { "AWS": "arn:aws:iam::370957321024:role/GitHub-CI-ESDK-Dafny-Role-us-west-2" }, "Action": "sts:AssumeRole" }, { "Effect": "Allow", - "Principal": { "AWS": "arn:aws:iam::370957321024:role/GitHub-CI-Public-ESDK-Role-us-west-2" }, + "Principal": { "AWS": "arn:aws:iam::370957321024:role/GitHub-CI-Public-ESDK-Dafny-Role-us-west-2" }, "Action": "sts:AssumeRole" }, { @@ -111,12 +111,12 @@ Resources: "Statement": [ { "Effect": "Allow", - "Principal": { "AWS": "arn:aws:iam::370957321024:role/GitHub-CI-ESDK-Role-us-west-2" }, + "Principal": { "AWS": "arn:aws:iam::370957321024:role/GitHub-CI-ESDK-Dafny-Role-us-west-2" }, "Action": "sts:AssumeRole" }, { "Effect": "Allow", - "Principal": { "AWS": "arn:aws:iam::370957321024:role/GitHub-CI-Public-ESDK-Role-us-west-2" }, + "Principal": { "AWS": "arn:aws:iam::370957321024:role/GitHub-CI-Public-ESDK-Dafny-Role-us-west-2" }, "Action": "sts:AssumeRole" }, { diff --git a/cfn/net/CB-Release.yml b/cfn/net/CB-Release.yml index e2588f677..29adc849b 100644 --- a/cfn/net/CB-Release.yml +++ b/cfn/net/CB-Release.yml @@ -14,7 +14,7 @@ Parameters: SourceLocation: Type: String Description: The https GitHub URL for the project - Default: "https://github.com/aws/aws-encryption-sdk.git" + Default: "https://github.com/aws/aws-encryption-sdk-dafny.git" NumberOfBuildsInBatch: Type: Number MaxValue: 100 @@ -108,7 +108,7 @@ Resources: { "Effect": "Allow", "Action": "sts:AssumeRole", - "Resource": "arn:aws:iam::370957321024:role/GitHub-CI-MPL-Role-us-west-2" + "Resource": "arn:aws:iam::370957321024:role/GitHub-CI-MPL-Dafny-Role-us-west-2" } ] }