Resolve merge conflict.

<body> Testing done ------------------------------------- * Related items ------------------------------------ * SIM/auto-cut ticket
aws · Mar 6, 2023 · 2fefafb · 2fefafb
1 parent 82bab02
commit 2fefafb
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 30 deletions.
diff --git a/...est/integ.application.js.snapshot/integ-servicecatalogappregistry-application.assets.json b/...est/integ.application.js.snapshot/integ-servicecatalogappregistry-application.assets.json
@@ -1,15 +1,15 @@
 {
   "version": "30.1.0",
   "files": {
-    "0d4e060fe5da6b164b9df46b0dc0cd20e7962c6cb531ffe08e6e5b99418f13de": {
+    "2332c6df6777cc571585060fa4888d6d3b9ef548aa00dcbfc53fbdde386d7591": {
       "source": {
         "path": "integ-servicecatalogappregistry-application.template.json",
         "packaging": "file"
       },
       "destinations": {
         "current_account-current_region": {
           "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
-          "objectKey": "0d4e060fe5da6b164b9df46b0dc0cd20e7962c6cb531ffe08e6e5b99418f13de.json",
+          "objectKey": "2332c6df6777cc571585060fa4888d6d3b9ef548aa00dcbfc53fbdde386d7591.json",
           "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
         }
       }

diff --git a/...t/integ.application.js.snapshot/integ-servicecatalogappregistry-application.template.json b/...t/integ.application.js.snapshot/integ-servicecatalogappregistry-application.template.json
@@ -39,10 +39,10 @@
     }
    }
   },
-  "TestApplicationRAMShare3dc6227daec11BF3E108": {
+  "TestApplicationRAMSharead8ba81b8cdd40199FD1": {
    "Type": "AWS::RAM::ResourceShare",
    "Properties": {
-    "Name": "RAMShare3dc6227daec1",
+    "Name": "RAMSharead8ba81b8cdd",
     "AllowExternalPrincipals": false,
     "PermissionArns": [
      "arn:aws:ram::aws:permission/AWSRAMPermissionServiceCatalogAppRegistryApplicationReadOnly"
@@ -121,23 +121,6 @@
    }
   }
  },
- "Outputs": {
-  "TestApplicationApplicationManagerUrlE1058321": {
-   "Description": "Application manager url for the application created.",
-   "Value": {
-    "Fn::Join": [
-     "",
-     [
-      "https://",
-      {
-       "Ref": "AWS::Region"
-      },
-      ".console.aws.amazon.com/systems-manager/appmanager/application/AWS_AppRegistry_Application-TestApplication"
-     ]
-    ]
-   }
-  }
- },
  "Parameters": {
   "BootstrapVersion": {
    "Type": "AWS::SSM::Parameter::Value<String>",

diff --git a/...s/@aws-cdk/aws-servicecatalogappregistry/test/integ.application.js.snapshot/manifest.json b/...s/@aws-cdk/aws-servicecatalogappregistry/test/integ.application.js.snapshot/manifest.json
@@ -17,7 +17,7 @@
         "validateOnSynth": false,
         "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
         "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
-        "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/0d4e060fe5da6b164b9df46b0dc0cd20e7962c6cb531ffe08e6e5b99418f13de.json",
+        "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/2332c6df6777cc571585060fa4888d6d3b9ef548aa00dcbfc53fbdde386d7591.json",
         "requiresBootstrapStackVersion": 6,
         "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
         "additionalDependencies": [
@@ -39,12 +39,6 @@
             "data": "TestApplication2FBC585F"
           }
         ],
-        "/integ-servicecatalogappregistry-application/TestApplication/ApplicationManagerUrl": [
-          {
-            "type": "aws:cdk:logicalId",
-            "data": "TestApplicationApplicationManagerUrlE1058321"
-          }
-        ],
         "/integ-servicecatalogappregistry-application/TestApplication/ResourceAssociationd232b63e52a8": [
           {
             "type": "aws:cdk:logicalId",
@@ -57,10 +51,10 @@
             "data": "TestApplicationAttributeGroupAssociation4ba7f5842818B8EE1C6F"
           }
         ],
-        "/integ-servicecatalogappregistry-application/TestApplication/RAMShare3dc6227daec1": [
+        "/integ-servicecatalogappregistry-application/TestApplication/RAMSharead8ba81b8cdd": [
           {
             "type": "aws:cdk:logicalId",
-            "data": "TestApplicationRAMShare3dc6227daec11BF3E108"
+            "data": "TestApplicationRAMSharead8ba81b8cdd40199FD1"
           }
         ],
         "/integ-servicecatalogappregistry-application/TestAttributeGroup/Resource": [