From d51db0436ea014fe85f9bba9044e1c15a52746e1 Mon Sep 17 00:00:00 2001 From: Vivek Vasudevan Nair Date: Thu, 26 Oct 2023 10:40:36 +1100 Subject: [PATCH 1/3] Replace deprecated AmazonEC2RoleforSSM with AmazonSSMManagedInstanceCore --- CHANGELOG.md | 3 +++ .../apps/aem/consolidated/instance-profiles.yaml | 2 +- .../apps/aem/full-set/instance-profiles.yaml | 12 ++++++------ 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dd2230fd..fd99cf91 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## Unreleased +### Added +- Replace deprecated AmazonEC2RoleforSSM with AmazonSSMManagedInstanceCore #RS-180 + ## 5.19.0 - 2022-11-22 ## 5.18.0 - 2022-10-26 diff --git a/templates/cloudformation/apps/aem/consolidated/instance-profiles.yaml b/templates/cloudformation/apps/aem/consolidated/instance-profiles.yaml index 4eca7865..8081a8cc 100644 --- a/templates/cloudformation/apps/aem/consolidated/instance-profiles.yaml +++ b/templates/cloudformation/apps/aem/consolidated/instance-profiles.yaml @@ -74,7 +74,7 @@ Resources: - ec2.amazonaws.com Version: '2012-10-17' ManagedPolicyArns: - - arn:aws:iam::aws:policy/service-role/AmazonEC2RoleforSSM + - arn:aws:iam::aws:policy/service-role/AmazonSSMManagedInstanceCore - Fn::If: - EBSVolumeEncryptionCMKAddManagedPolicyCondition - Fn::Select: diff --git a/templates/cloudformation/apps/aem/full-set/instance-profiles.yaml b/templates/cloudformation/apps/aem/full-set/instance-profiles.yaml index 6feaab63..0e0b61d5 100644 --- a/templates/cloudformation/apps/aem/full-set/instance-profiles.yaml +++ b/templates/cloudformation/apps/aem/full-set/instance-profiles.yaml @@ -224,7 +224,7 @@ Resources: - ec2.amazonaws.com Version: '2012-10-17' ManagedPolicyArns: - - arn:aws:iam::aws:policy/service-role/AmazonEC2RoleforSSM + - arn:aws:iam::aws:policy/service-role/AmazonSSMManagedInstanceCore - Fn::If: - EBSVolumeEncryptionCMKAddManagedPolicyCondition - Fn::Select: @@ -286,7 +286,7 @@ Resources: - ec2.amazonaws.com Version: '2012-10-17' ManagedPolicyArns: - - arn:aws:iam::aws:policy/service-role/AmazonEC2RoleforSSM + - arn:aws:iam::aws:policy/service-role/AmazonSSMManagedInstanceCore - Fn::If: - EBSVolumeEncryptionCMKAddManagedPolicyCondition - Fn::Select: @@ -354,7 +354,7 @@ Resources: - ec2.amazonaws.com Version: '2012-10-17' ManagedPolicyArns: - - arn:aws:iam::aws:policy/service-role/AmazonEC2RoleforSSM + - arn:aws:iam::aws:policy/service-role/AmazonSSMManagedInstanceCore - Fn::If: - EBSVolumeEncryptionCMKAddManagedPolicyCondition - Fn::Select: @@ -444,7 +444,7 @@ Resources: - ec2.amazonaws.com Version: '2012-10-17' ManagedPolicyArns: - - arn:aws:iam::aws:policy/service-role/AmazonEC2RoleforSSM + - arn:aws:iam::aws:policy/service-role/AmazonSSMManagedInstanceCore - Fn::If: - EBSVolumeEncryptionCMKAddManagedPolicyCondition - Fn::Select: @@ -544,7 +544,7 @@ Resources: - ec2.amazonaws.com Version: '2012-10-17' ManagedPolicyArns: - - arn:aws:iam::aws:policy/service-role/AmazonEC2RoleforSSM + - arn:aws:iam::aws:policy/service-role/AmazonSSMManagedInstanceCore - Fn::If: - EBSVolumeEncryptionCMKAddManagedPolicyCondition - Fn::Select: @@ -610,7 +610,7 @@ Resources: - ec2.amazonaws.com Version: '2012-10-17' ManagedPolicyArns: - - arn:aws:iam::aws:policy/service-role/AmazonEC2RoleforSSM + - arn:aws:iam::aws:policy/service-role/AmazonSSMManagedInstanceCore - Fn::If: - EBSVolumeEncryptionCMKAddManagedPolicyCondition - Fn::Select: From 06c700d0d2641aa75440798f0d0d88233f40600b Mon Sep 17 00:00:00 2001 From: Vivek Nair Date: Thu, 26 Oct 2023 10:52:46 +1100 Subject: [PATCH 2/3] Updated correct arn for AmazonSSMManagedInstanceCore --- .../apps/aem/consolidated/instance-profiles.yaml | 2 +- .../apps/aem/full-set/instance-profiles.yaml | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/templates/cloudformation/apps/aem/consolidated/instance-profiles.yaml b/templates/cloudformation/apps/aem/consolidated/instance-profiles.yaml index 8081a8cc..74c234dd 100644 --- a/templates/cloudformation/apps/aem/consolidated/instance-profiles.yaml +++ b/templates/cloudformation/apps/aem/consolidated/instance-profiles.yaml @@ -74,7 +74,7 @@ Resources: - ec2.amazonaws.com Version: '2012-10-17' ManagedPolicyArns: - - arn:aws:iam::aws:policy/service-role/AmazonSSMManagedInstanceCore + - arn:aws:iam::aws:policy/AmazonSSMManagedInstanceCore - Fn::If: - EBSVolumeEncryptionCMKAddManagedPolicyCondition - Fn::Select: diff --git a/templates/cloudformation/apps/aem/full-set/instance-profiles.yaml b/templates/cloudformation/apps/aem/full-set/instance-profiles.yaml index 0e0b61d5..5b198195 100644 --- a/templates/cloudformation/apps/aem/full-set/instance-profiles.yaml +++ b/templates/cloudformation/apps/aem/full-set/instance-profiles.yaml @@ -224,7 +224,7 @@ Resources: - ec2.amazonaws.com Version: '2012-10-17' ManagedPolicyArns: - - arn:aws:iam::aws:policy/service-role/AmazonSSMManagedInstanceCore + - arn:aws:iam::aws:policy/AmazonSSMManagedInstanceCore - Fn::If: - EBSVolumeEncryptionCMKAddManagedPolicyCondition - Fn::Select: @@ -286,7 +286,7 @@ Resources: - ec2.amazonaws.com Version: '2012-10-17' ManagedPolicyArns: - - arn:aws:iam::aws:policy/service-role/AmazonSSMManagedInstanceCore + - arn:aws:iam::aws:policy/AmazonSSMManagedInstanceCore - Fn::If: - EBSVolumeEncryptionCMKAddManagedPolicyCondition - Fn::Select: @@ -354,7 +354,7 @@ Resources: - ec2.amazonaws.com Version: '2012-10-17' ManagedPolicyArns: - - arn:aws:iam::aws:policy/service-role/AmazonSSMManagedInstanceCore + - arn:aws:iam::aws:policy/AmazonSSMManagedInstanceCore - Fn::If: - EBSVolumeEncryptionCMKAddManagedPolicyCondition - Fn::Select: @@ -444,7 +444,7 @@ Resources: - ec2.amazonaws.com Version: '2012-10-17' ManagedPolicyArns: - - arn:aws:iam::aws:policy/service-role/AmazonSSMManagedInstanceCore + - arn:aws:iam::aws:policy/AmazonSSMManagedInstanceCore - Fn::If: - EBSVolumeEncryptionCMKAddManagedPolicyCondition - Fn::Select: @@ -544,7 +544,7 @@ Resources: - ec2.amazonaws.com Version: '2012-10-17' ManagedPolicyArns: - - arn:aws:iam::aws:policy/service-role/AmazonSSMManagedInstanceCore + - arn:aws:iam::aws:policy/AmazonSSMManagedInstanceCore - Fn::If: - EBSVolumeEncryptionCMKAddManagedPolicyCondition - Fn::Select: @@ -610,7 +610,7 @@ Resources: - ec2.amazonaws.com Version: '2012-10-17' ManagedPolicyArns: - - arn:aws:iam::aws:policy/service-role/AmazonSSMManagedInstanceCore + - arn:aws:iam::aws:policy/AmazonSSMManagedInstanceCore - Fn::If: - EBSVolumeEncryptionCMKAddManagedPolicyCondition - Fn::Select: From 0288bb335c5ed75a7e9d0f18b4953eca46047cab Mon Sep 17 00:00:00 2001 From: Vivek Nair Date: Thu, 26 Oct 2023 11:04:26 +1100 Subject: [PATCH 3/3] Updating changelog entry --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fd99cf91..6bdf9d17 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## Unreleased -### Added +### Changed - Replace deprecated AmazonEC2RoleforSSM with AmazonSSMManagedInstanceCore #RS-180 ## 5.19.0 - 2022-11-22