Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(appconfig-alpha): support for composite alarms #28156

Merged
merged 8 commits into from
Dec 5, 2023
Merged

feat(appconfig-alpha): support for composite alarms #28156

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3f3a848
feat(appconfig): support for composite alarms
chenjane-dev Nov 27, 2023
cb814f0
feat(appconfig): support for composite alarms
chenjane-dev Nov 27, 2023
38082c9
feat(appconfig): support for composite alarms
chenjane-dev Nov 27, 2023
03e75f3
Merge branch 'main' into composite-alarm
chenjane-dev Nov 28, 2023
1e80307
Update packages/@aws-cdk/aws-appconfig-alpha/lib/environment.ts
chenjane-dev Nov 30, 2023
2ac3e0e
Update packages/@aws-cdk/aws-appconfig-alpha/lib/environment.ts
chenjane-dev Nov 30, 2023
7fd9ed1
Add integ test snapshot
chenjane-dev Nov 30, 2023
8193d6c
Merge branch 'main' into composite-alarm
mergify[bot] Dec 5, 2023
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
Prev Previous commit
Next Next commit
Update packages/@aws-cdk/aws-appconfig-alpha/lib/environment.ts 
Co-authored-by: Luca Pizzini <lpizzini7@gmail.com>
  • Loading branch information
@chenjane-dev @lpizzinidev
chenjane-dev and lpizzinidev committed Nov 30, 2023
commit 2ac3e0e7bfae3b54862b6b6b1127ac87c022a79a
6 changes: 3 additions & 3 deletions packages/@aws-cdk/aws-appconfig-alpha/test/environment.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ describe('environment', () => {
},
AlarmRoleArn: {
'Fn::GetAtt': [
'MyEnvironmentRole51BFC2F05',
'MyEnvironmentRoleCompositeAlarm8C2A0542',
'Arn',
],
},
Expand Down Expand Up @@ -357,7 +357,7 @@ describe('environment', () => {
},
AlarmRoleArn: {
'Fn::GetAtt': [
'MyEnvironmentRole51BFC2F05',
'MyEnvironmentRoleCompositeAlarm8C2A0542',
'Arn',
],
},
Expand All @@ -371,7 +371,7 @@ describe('environment', () => {
},
AlarmRoleArn: {
'Fn::GetAtt': [
'MyEnvironmentRole51BFC2F05',
'MyEnvironmentRoleCompositeAlarm8C2A0542',
'Arn',
],
},
Expand Down
4 changes: 2 additions & 2 deletions ...-appconfig-alpha/test/integ.environment.js.snapshot/aws-appconfig-environment.assets.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

86 changes: 0 additions & 86 deletions ...ppconfig-alpha/test/integ.environment.js.snapshot/aws-appconfig-environment.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,27 +35,6 @@
}
}
},
"MyCompositeAlarm0F045229": {
"Type": "AWS::CloudWatch::CompositeAlarm",
"Properties": {
"AlarmName": "awsappconfigenvironmentMyCompositeAlarm730A7A48",
"AlarmRule": {
"Fn::Join": [
"",
[
"ALARM(\"",
{
"Fn::GetAtt": [
"MyAlarm696658B6",
"Arn"
]
},
"\")"
]
]
}
}
},
"MyEnvironmentRole01C8C013F": {
"Type": "AWS::IAM::Role",
"Properties": {
Expand Down Expand Up @@ -93,57 +72,6 @@
]
}
},
"MyEnvironmentRole51BFC2F05": {
"Type": "AWS::IAM::Role",
"Properties": {
"AssumeRolePolicyDocument": {
"Statement": [
{
"Action": "sts:AssumeRole",
"Effect": "Allow",
"Principal": {
"Service": "appconfig.amazonaws.com"
}
}
],
"Version": "2012-10-17"
},
"Policies": [
{
"PolicyDocument": {
"Statement": [
{
"Action": "cloudwatch:DescribeAlarms",
"Effect": "Allow",
"Resource": {
"Fn::Join": [
"",
[
"arn:",
{
"Ref": "AWS::Partition"
},
":cloudwatch:",
{
"Ref": "AWS::Region"
},
":",
{
"Ref": "AWS::AccountId"
},
":alarm:*"
]
]
}
}
],
"Version": "2012-10-17"
},
"PolicyName": "AllowAppConfigMonitorAlarmPolicy"
}
]
}
},
"MyEnvironment465E4DEA": {
"Type": "AWS::AppConfig::Environment",
"Properties": {
Expand Down Expand Up @@ -179,20 +107,6 @@
"Arn"
]
}
},
{
"AlarmArn": {
"Fn::GetAtt": [
"MyCompositeAlarm0F045229",
"Arn"
]
},
"AlarmRoleArn": {
"Fn::GetAtt": [
"MyEnvironmentRole51BFC2F05",
"Arn"
]
}
}
],
"Name": "awsappconfigenvironment-MyEnvironment-C8813182"
Expand Down
38 changes: 1 addition & 37 deletions packages/@aws-cdk/aws-appconfig-alpha/test/integ.environment.js.snapshot/manifest.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading