Skip to content

Commit fa9eef0

Browse files
authored
fix(servicecatalogappregistry): outputs are not deployable (#23652)
As a customer, if I want to generate my application name from dynamic parameters then `CfnOutput` description for Application manager url is in undeployable state as `Description` only supports string. This fixes #23641 ### All Submissions: * [ X] Have you followed the guidelines in our [Contributing guide?](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md) ### Adding new Construct Runtime Dependencies: * [ ] This PR adds new construct runtime dependencies following the process described [here](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md/#adding-construct-runtime-dependencies) ### New Features * [ ] Have you added the new feature to an [integration test](https://github.com/aws/aws-cdk/blob/main/INTEGRATION_TESTS.md)? * [ ] Did you use `yarn integ` to deploy the infrastructure and generate the snapshot (i.e. `yarn integ` without `--dry-run`)? *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
1 parent 41327d8 commit fa9eef0

File tree

9 files changed

+18
-18
lines changed

9 files changed

+18
-18
lines changed

packages/@aws-cdk/aws-servicecatalogappregistry/lib/application.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ export class Application extends ApplicationBase {
277277

278278
this.applicationManagerUrl = new cdk.CfnOutput(this, 'ApplicationManagerUrl', {
279279
value: `https://${this.env.region}.console.aws.amazon.com/systems-manager/appmanager/application/AWS_AppRegistry_Application-${this.applicationName}`,
280-
description: `Application manager url for application ${this.applicationName}`,
280+
description: 'Application manager url for the application created.',
281281
});
282282
}
283283

packages/@aws-cdk/aws-servicecatalogappregistry/lib/target-application.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ class CreateTargetApplication extends TargetApplication {
9292
public bind(scope: Construct): BindTargetApplicationResult {
9393
const stackId = this.applicationOptions.stackId ?? 'ApplicationAssociatorStack';
9494
(this.applicationOptions.description as string) =
95-
this.applicationOptions.description || `Stack that holds the ${this.applicationOptions.applicationName} application`;
95+
this.applicationOptions.description || 'Stack to create AppRegistry application';
9696
(this.applicationOptions.env as cdk.Environment) =
9797
this.applicationOptions.env || { account: process.env.CDK_DEFAULT_ACCOUNT, region: process.env.CDK_DEFAULT_REGION };
9898
const applicationStack = new cdk.Stack(scope, stackId, this.applicationOptions);
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"version":"22.0.0"}
1+
{"version":"29.0.0"}

packages/@aws-cdk/aws-servicecatalogappregistry/test/integ.application.js.snapshot/integ-servicecatalogappregistry-application.assets.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
2-
"version": "22.0.0",
2+
"version": "29.0.0",
33
"files": {
4-
"225f3d7f7d17bfb53aa17ae8a44119a756f2fc51682bfd5ee27b84ea25f994eb": {
4+
"8bf01e42edcc7e9cd4c65b9db9e52d2d6564f931bc84e7f564a1a4c43e499d6e": {
55
"source": {
66
"path": "integ-servicecatalogappregistry-application.template.json",
77
"packaging": "file"
88
},
99
"destinations": {
1010
"current_account-current_region": {
1111
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
12-
"objectKey": "225f3d7f7d17bfb53aa17ae8a44119a756f2fc51682bfd5ee27b84ea25f994eb.json",
12+
"objectKey": "8bf01e42edcc7e9cd4c65b9db9e52d2d6564f931bc84e7f564a1a4c43e499d6e.json",
1313
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
1414
}
1515
}

packages/@aws-cdk/aws-servicecatalogappregistry/test/integ.application.js.snapshot/integ-servicecatalogappregistry-application.template.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
"TestApplication2FBC585F": {
44
"Type": "AWS::ServiceCatalogAppRegistry::Application",
55
"Properties": {
6-
"Name": "myApplication",
7-
"Description": "my application description"
6+
"Name": "TestApplication",
7+
"Description": "Test application description"
88
}
99
},
1010
"TestApplicationResourceAssociationd232b63e52a8414E905D": {
@@ -123,7 +123,7 @@
123123
},
124124
"Outputs": {
125125
"TestApplicationApplicationManagerUrlE1058321": {
126-
"Description": "Application manager url for application myApplication",
126+
"Description": "Application manager url for the application created.",
127127
"Value": {
128128
"Fn::Join": [
129129
"",
@@ -132,7 +132,7 @@
132132
{
133133
"Ref": "AWS::Region"
134134
},
135-
".console.aws.amazon.com/systems-manager/appmanager/application/AWS_AppRegistry_Application-myApplication"
135+
".console.aws.amazon.com/systems-manager/appmanager/application/AWS_AppRegistry_Application-TestApplication"
136136
]
137137
]
138138
}

packages/@aws-cdk/aws-servicecatalogappregistry/test/integ.application.js.snapshot/integ.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "22.0.0",
2+
"version": "29.0.0",
33
"testCases": {
44
"integ.application": {
55
"stacks": [

packages/@aws-cdk/aws-servicecatalogappregistry/test/integ.application.js.snapshot/manifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "22.0.0",
2+
"version": "29.0.0",
33
"artifacts": {
44
"integ-servicecatalogappregistry-application.assets": {
55
"type": "cdk:asset-manifest",
@@ -17,7 +17,7 @@
1717
"validateOnSynth": false,
1818
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
1919
"cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
20-
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/225f3d7f7d17bfb53aa17ae8a44119a756f2fc51682bfd5ee27b84ea25f994eb.json",
20+
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/8bf01e42edcc7e9cd4c65b9db9e52d2d6564f931bc84e7f564a1a4c43e499d6e.json",
2121
"requiresBootstrapStackVersion": 6,
2222
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
2323
"additionalDependencies": [

packages/@aws-cdk/aws-servicecatalogappregistry/test/integ.application.js.snapshot/tree.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
"attributes": {
1919
"aws:cdk:cloudformation:type": "AWS::ServiceCatalogAppRegistry::Application",
2020
"aws:cdk:cloudformation:props": {
21-
"name": "myApplication",
22-
"description": "my application description"
21+
"name": "TestApplication",
22+
"description": "Test application description"
2323
}
2424
},
2525
"constructInfo": {
@@ -249,7 +249,7 @@
249249
"path": "Tree",
250250
"constructInfo": {
251251
"fqn": "constructs.Construct",
252-
"version": "10.1.189"
252+
"version": "10.1.209"
253253
}
254254
}
255255
},

packages/@aws-cdk/aws-servicecatalogappregistry/test/integ.application.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ const app = new cdk.App();
66
const stack = new cdk.Stack(app, 'integ-servicecatalogappregistry-application');
77

88
const application = new appreg.Application(stack, 'TestApplication', {
9-
applicationName: 'myApplication',
10-
description: 'my application description',
9+
applicationName: 'TestApplication',
10+
description: 'Test application description',
1111
});
1212

1313
const attributeGroup = new appreg.AttributeGroup(stack, 'TestAttributeGroup', {

0 commit comments

Comments
 (0)