From 8f632c20c5a0d6c0da819d7cd971a1856a1add40 Mon Sep 17 00:00:00 2001 From: Edward Foyle Date: Wed, 10 Jan 2024 14:54:03 -0800 Subject: [PATCH] chore(release): Merge main into dev (#13525) * fix: set policy effect deny when removing auth * fix: set policy effect deny when removing auth (#13523) * chore(release): Publish latest - @aws-amplify/amplify-category-notifications@2.26.12 - @aws-amplify/cli@12.10.1 - @aws-amplify/cli-internal@12.10.1 - @aws-amplify/amplify-provider-awscloudformation@8.10.2 - @aws-amplify/amplify-util-mock@5.9.2 --------- Co-authored-by: aws-amplify-bot --- .../CHANGELOG.md | 8 ++++++++ .../package.json | 4 ++-- packages/amplify-cli-npm/CHANGELOG.md | 8 ++++++++ packages/amplify-cli-npm/package.json | 4 ++-- packages/amplify-cli/CHANGELOG.md | 8 ++++++++ packages/amplify-cli/package.json | 8 ++++---- .../CHANGELOG.md | 11 ++++++++++ .../package.json | 2 +- .../resources/update-idp-roles-cfn.json | 2 ++ packages/amplify-util-mock/CHANGELOG.md | 8 ++++++++ packages/amplify-util-mock/package.json | 4 ++-- yarn.lock | 20 +++++++++---------- 12 files changed, 66 insertions(+), 21 deletions(-) diff --git a/packages/amplify-category-notifications/CHANGELOG.md b/packages/amplify-category-notifications/CHANGELOG.md index 7be87d858b6..2c532480cf2 100644 --- a/packages/amplify-category-notifications/CHANGELOG.md +++ b/packages/amplify-category-notifications/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [2.26.12](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-category-notifications@2.26.11...@aws-amplify/amplify-category-notifications@2.26.12) (2024-01-10) + +**Note:** Version bump only for package @aws-amplify/amplify-category-notifications + + + + + ## [2.26.11](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-category-notifications@2.26.10...@aws-amplify/amplify-category-notifications@2.26.11) (2023-12-16) **Note:** Version bump only for package @aws-amplify/amplify-category-notifications diff --git a/packages/amplify-category-notifications/package.json b/packages/amplify-category-notifications/package.json index 44657b6ccbe..cb07413a4da 100644 --- a/packages/amplify-category-notifications/package.json +++ b/packages/amplify-category-notifications/package.json @@ -1,6 +1,6 @@ { "name": "@aws-amplify/amplify-category-notifications", - "version": "2.26.11", + "version": "2.26.12", "description": "amplify-cli notifications plugin", "repository": { "type": "git", @@ -29,7 +29,7 @@ "@aws-amplify/amplify-cli-core": "4.3.0", "@aws-amplify/amplify-environment-parameters": "1.9.5", "@aws-amplify/amplify-prompts": "2.8.6", - "@aws-amplify/amplify-provider-awscloudformation": "8.10.1", + "@aws-amplify/amplify-provider-awscloudformation": "8.10.2", "aws-sdk": "^2.1464.0", "chalk": "^4.1.1", "fs-extra": "^8.1.0", diff --git a/packages/amplify-cli-npm/CHANGELOG.md b/packages/amplify-cli-npm/CHANGELOG.md index f745d8e74fd..af58efd3950 100644 --- a/packages/amplify-cli-npm/CHANGELOG.md +++ b/packages/amplify-cli-npm/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [12.10.1](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/cli@12.10.0...@aws-amplify/cli@12.10.1) (2024-01-10) + +**Note:** Version bump only for package @aws-amplify/cli + + + + + # [12.10.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/cli@12.9.0...@aws-amplify/cli@12.10.0) (2023-12-16) diff --git a/packages/amplify-cli-npm/package.json b/packages/amplify-cli-npm/package.json index 12068c189ef..e850472fd22 100644 --- a/packages/amplify-cli-npm/package.json +++ b/packages/amplify-cli-npm/package.json @@ -1,6 +1,6 @@ { "name": "@aws-amplify/cli", - "version": "12.10.0", + "version": "12.10.1", "description": "Amplify CLI", "repository": { "type": "git", @@ -36,7 +36,7 @@ "tar-stream": "^2.2.0" }, "devDependencies": { - "@aws-amplify/cli-internal": "12.10.0", + "@aws-amplify/cli-internal": "12.10.1", "@types/tar": "^6.1.1", "rimraf": "^3.0.2" }, diff --git a/packages/amplify-cli/CHANGELOG.md b/packages/amplify-cli/CHANGELOG.md index ccd964ffeba..c711b31ab62 100644 --- a/packages/amplify-cli/CHANGELOG.md +++ b/packages/amplify-cli/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [12.10.1](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/cli-internal@12.10.0...@aws-amplify/cli-internal@12.10.1) (2024-01-10) + +**Note:** Version bump only for package @aws-amplify/cli-internal + + + + + # [12.10.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/cli-internal@12.9.0...@aws-amplify/cli-internal@12.10.0) (2023-12-16) diff --git a/packages/amplify-cli/package.json b/packages/amplify-cli/package.json index 02a3a462fd2..e77e1929dec 100644 --- a/packages/amplify-cli/package.json +++ b/packages/amplify-cli/package.json @@ -1,6 +1,6 @@ { "name": "@aws-amplify/cli-internal", - "version": "12.10.0", + "version": "12.10.1", "description": "Amplify CLI", "repository": { "type": "git", @@ -43,7 +43,7 @@ "@aws-amplify/amplify-category-geo": "3.5.5", "@aws-amplify/amplify-category-hosting": "3.5.27", "@aws-amplify/amplify-category-interactions": "5.1.19", - "@aws-amplify/amplify-category-notifications": "2.26.11", + "@aws-amplify/amplify-category-notifications": "2.26.12", "@aws-amplify/amplify-category-predictions": "5.5.5", "@aws-amplify/amplify-category-storage": "5.5.5", "@aws-amplify/amplify-cli-core": "4.3.0", @@ -60,10 +60,10 @@ "@aws-amplify/amplify-go-function-template-provider": "1.4.7", "@aws-amplify/amplify-nodejs-function-template-provider": "2.10.0", "@aws-amplify/amplify-prompts": "2.8.6", - "@aws-amplify/amplify-provider-awscloudformation": "8.10.1", + "@aws-amplify/amplify-provider-awscloudformation": "8.10.2", "@aws-amplify/amplify-python-function-template-provider": "1.4.7", "@aws-amplify/amplify-util-import": "2.8.3", - "@aws-amplify/amplify-util-mock": "5.9.1", + "@aws-amplify/amplify-util-mock": "5.9.2", "@aws-amplify/amplify-util-uibuilder": "1.14.1", "@aws-cdk/cloudformation-diff": "~2.68.0", "amplify-codegen": "^4.7.3", diff --git a/packages/amplify-provider-awscloudformation/CHANGELOG.md b/packages/amplify-provider-awscloudformation/CHANGELOG.md index 19b7f73873a..ef2a4b8806c 100644 --- a/packages/amplify-provider-awscloudformation/CHANGELOG.md +++ b/packages/amplify-provider-awscloudformation/CHANGELOG.md @@ -3,6 +3,17 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [8.10.2](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-provider-awscloudformation@8.10.1...@aws-amplify/amplify-provider-awscloudformation@8.10.2) (2024-01-10) + + +### Bug Fixes + +* set policy effect deny when removing auth ([#13523](https://github.com/aws-amplify/amplify-cli/issues/13523)) ([73b08dc](https://github.com/aws-amplify/amplify-cli/commit/73b08dc424db2fb60399c5343c314e02e849d4a1)) + + + + + ## [8.10.1](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-provider-awscloudformation@8.10.0...@aws-amplify/amplify-provider-awscloudformation@8.10.1) (2023-12-16) **Note:** Version bump only for package @aws-amplify/amplify-provider-awscloudformation diff --git a/packages/amplify-provider-awscloudformation/package.json b/packages/amplify-provider-awscloudformation/package.json index a740cd8e3a8..0c6384adbbe 100644 --- a/packages/amplify-provider-awscloudformation/package.json +++ b/packages/amplify-provider-awscloudformation/package.json @@ -1,6 +1,6 @@ { "name": "@aws-amplify/amplify-provider-awscloudformation", - "version": "8.10.1", + "version": "8.10.2", "description": "AWS CloudFormation Provider", "repository": { "type": "git", diff --git a/packages/amplify-provider-awscloudformation/resources/update-idp-roles-cfn.json b/packages/amplify-provider-awscloudformation/resources/update-idp-roles-cfn.json index a17c761bc52..ebe7d192dbf 100644 --- a/packages/amplify-provider-awscloudformation/resources/update-idp-roles-cfn.json +++ b/packages/amplify-provider-awscloudformation/resources/update-idp-roles-cfn.json @@ -47,6 +47,8 @@ " try {", " delete authParamsJson.Statement[0].Condition;", " delete unauthParamsJson.Statement[0].Condition;", + " authParamsJson.Statement[0].Effect = 'Deny'", + " unauthParamsJson.Statement[0].Effect = 'Deny'", " let authParams = {PolicyDocument: JSON.stringify(authParamsJson), RoleName: authRoleName};", " let unauthParams = {PolicyDocument: JSON.stringify(unauthParamsJson), RoleName: unauthRoleName};", " const iam = new IAMClient({region: event.ResourceProperties.region});", diff --git a/packages/amplify-util-mock/CHANGELOG.md b/packages/amplify-util-mock/CHANGELOG.md index 75fab0596da..115acf65283 100644 --- a/packages/amplify-util-mock/CHANGELOG.md +++ b/packages/amplify-util-mock/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [5.9.2](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-util-mock@5.9.1...@aws-amplify/amplify-util-mock@5.9.2) (2024-01-10) + +**Note:** Version bump only for package @aws-amplify/amplify-util-mock + + + + + ## [5.9.1](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-util-mock@5.9.0...@aws-amplify/amplify-util-mock@5.9.1) (2023-12-16) **Note:** Version bump only for package @aws-amplify/amplify-util-mock diff --git a/packages/amplify-util-mock/package.json b/packages/amplify-util-mock/package.json index 717de27cd3a..86d2e5c3f84 100644 --- a/packages/amplify-util-mock/package.json +++ b/packages/amplify-util-mock/package.json @@ -1,6 +1,6 @@ { "name": "@aws-amplify/amplify-util-mock", - "version": "5.9.1", + "version": "5.9.2", "description": "amplify cli plugin providing local testing", "repository": { "type": "git", @@ -37,7 +37,7 @@ "@aws-amplify/amplify-environment-parameters": "1.9.5", "@aws-amplify/amplify-opensearch-simulator": "1.7.5", "@aws-amplify/amplify-prompts": "2.8.6", - "@aws-amplify/amplify-provider-awscloudformation": "8.10.1", + "@aws-amplify/amplify-provider-awscloudformation": "8.10.2", "@hapi/topo": "^5.0.0", "amplify-codegen": "^4.7.3", "amplify-dynamodb-simulator": "2.9.9", diff --git a/yarn.lock b/yarn.lock index b7bb686c927..de42336f7c4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -335,14 +335,14 @@ __metadata: languageName: unknown linkType: soft -"@aws-amplify/amplify-category-notifications@2.26.11, @aws-amplify/amplify-category-notifications@workspace:packages/amplify-category-notifications": +"@aws-amplify/amplify-category-notifications@2.26.12, @aws-amplify/amplify-category-notifications@workspace:packages/amplify-category-notifications": version: 0.0.0-use.local resolution: "@aws-amplify/amplify-category-notifications@workspace:packages/amplify-category-notifications" dependencies: "@aws-amplify/amplify-cli-core": 4.3.0 "@aws-amplify/amplify-environment-parameters": 1.9.5 "@aws-amplify/amplify-prompts": 2.8.6 - "@aws-amplify/amplify-provider-awscloudformation": 8.10.1 + "@aws-amplify/amplify-provider-awscloudformation": 8.10.2 aws-sdk: ^2.1464.0 chalk: ^4.1.1 fs-extra: ^8.1.0 @@ -793,7 +793,7 @@ __metadata: languageName: unknown linkType: soft -"@aws-amplify/amplify-provider-awscloudformation@8.10.1, @aws-amplify/amplify-provider-awscloudformation@workspace:packages/amplify-provider-awscloudformation": +"@aws-amplify/amplify-provider-awscloudformation@8.10.2, @aws-amplify/amplify-provider-awscloudformation@workspace:packages/amplify-provider-awscloudformation": version: 0.0.0-use.local resolution: "@aws-amplify/amplify-provider-awscloudformation@workspace:packages/amplify-provider-awscloudformation" dependencies: @@ -867,7 +867,7 @@ __metadata: languageName: unknown linkType: soft -"@aws-amplify/amplify-util-mock@5.9.1, @aws-amplify/amplify-util-mock@workspace:packages/amplify-util-mock": +"@aws-amplify/amplify-util-mock@5.9.2, @aws-amplify/amplify-util-mock@workspace:packages/amplify-util-mock": version: 0.0.0-use.local resolution: "@aws-amplify/amplify-util-mock@workspace:packages/amplify-util-mock" dependencies: @@ -878,7 +878,7 @@ __metadata: "@aws-amplify/amplify-function-plugin-interface": 1.12.1 "@aws-amplify/amplify-opensearch-simulator": 1.7.5 "@aws-amplify/amplify-prompts": 2.8.6 - "@aws-amplify/amplify-provider-awscloudformation": 8.10.1 + "@aws-amplify/amplify-provider-awscloudformation": 8.10.2 "@aws-amplify/graphql-auth-transformer": ^3.3.1 "@aws-amplify/graphql-default-value-transformer": ^2.2.1 "@aws-amplify/graphql-function-transformer": ^2.1.13 @@ -1066,7 +1066,7 @@ __metadata: languageName: unknown linkType: soft -"@aws-amplify/cli-internal@12.10.0, @aws-amplify/cli-internal@workspace:packages/amplify-cli": +"@aws-amplify/cli-internal@12.10.1, @aws-amplify/cli-internal@workspace:packages/amplify-cli": version: 0.0.0-use.local resolution: "@aws-amplify/cli-internal@workspace:packages/amplify-cli" dependencies: @@ -1079,7 +1079,7 @@ __metadata: "@aws-amplify/amplify-category-geo": 3.5.5 "@aws-amplify/amplify-category-hosting": 3.5.27 "@aws-amplify/amplify-category-interactions": 5.1.19 - "@aws-amplify/amplify-category-notifications": 2.26.11 + "@aws-amplify/amplify-category-notifications": 2.26.12 "@aws-amplify/amplify-category-predictions": 5.5.5 "@aws-amplify/amplify-category-storage": 5.5.5 "@aws-amplify/amplify-cli-core": 4.3.0 @@ -1097,10 +1097,10 @@ __metadata: "@aws-amplify/amplify-go-function-template-provider": 1.4.7 "@aws-amplify/amplify-nodejs-function-template-provider": 2.10.0 "@aws-amplify/amplify-prompts": 2.8.6 - "@aws-amplify/amplify-provider-awscloudformation": 8.10.1 + "@aws-amplify/amplify-provider-awscloudformation": 8.10.2 "@aws-amplify/amplify-python-function-template-provider": 1.4.7 "@aws-amplify/amplify-util-import": 2.8.3 - "@aws-amplify/amplify-util-mock": 5.9.1 + "@aws-amplify/amplify-util-mock": 5.9.2 "@aws-amplify/amplify-util-uibuilder": 1.14.1 "@aws-cdk/cloudformation-diff": ~2.68.0 "@types/archiver": ^5.3.1 @@ -1166,7 +1166,7 @@ __metadata: version: 0.0.0-use.local resolution: "@aws-amplify/cli@workspace:packages/amplify-cli-npm" dependencies: - "@aws-amplify/cli-internal": 12.10.0 + "@aws-amplify/cli-internal": 12.10.1 "@types/tar": ^6.1.1 axios: ^1.6.2 rimraf: ^3.0.2