Updated Integ Test with manual steps for provisioning asset product

aws · Nov 14, 2022 · 1afdca3 · 1afdca3
1 parent b1405cb
commit 1afdca3
Show file tree

Hide file tree

Showing 10 changed files with 534 additions and 393 deletions.
diff --git a/...t.js.snapshot/asset.6412a5f4524c6b41d26fbeee226c68c2dad735393940a51008d77e6f8b1038f5.json b/...t.js.snapshot/asset.6412a5f4524c6b41d26fbeee226c68c2dad735393940a51008d77e6f8b1038f5.json
diff --git a/...ct.js.snapshot/asset.95c924c84f5d023be4edee540cb2cb401a49f115d01ed403b288f6cb412771df.zip b/...ct.js.snapshot/asset.95c924c84f5d023be4edee540cb2cb401a49f115d01ed403b288f6cb412771df.zip
diff --git a/...t.js.snapshot/asset.b59f768286e16b69628bb23b9c1a1f07300a24101b8979d8e2a94ff1ab03d09e.json b/...t.js.snapshot/asset.b59f768286e16b69628bb23b9c1a1f07300a24101b8979d8e2a94ff1ab03d09e.json
diff --git a/...ct.js.snapshot/asset.c409e6c5845f1f349df8cd84e160bf6f1c35d2b060b63e1f032f9bd39d4542cc.zip b/...ct.js.snapshot/asset.c409e6c5845f1f349df8cd84e160bf6f1c35d2b060b63e1f032f9bd39d4542cc.zip
diff --git a/packages/@aws-cdk/aws-servicecatalog/test/integ.product.js.snapshot/cdk.out b/packages/@aws-cdk/aws-servicecatalog/test/integ.product.js.snapshot/cdk.out
@@ -1 +1 @@
-{"version":"20.0.0"}
+{"version":"21.0.0"}
diff --git a/...ws-servicecatalog/test/integ.product.js.snapshot/integ-servicecatalog-product.assets.json b/...ws-servicecatalog/test/integ.product.js.snapshot/integ-servicecatalog-product.assets.json
@@ -66,15 +66,15 @@
         }
       }
     },
-    "c409e6c5845f1f349df8cd84e160bf6f1c35d2b060b63e1f032f9bd39d4542cc": {
+    "5d8d1d0aacea23824c62f362e1e3c14b7dd14a31c71b53bfae4d14a6373c5510": {
       "source": {
-        "path": "asset.c409e6c5845f1f349df8cd84e160bf6f1c35d2b060b63e1f032f9bd39d4542cc.zip",
+        "path": "asset.5d8d1d0aacea23824c62f362e1e3c14b7dd14a31c71b53bfae4d14a6373c5510.zip",
         "packaging": "file"
       },
       "destinations": {
         "current_account-current_region": {
           "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
-          "objectKey": "c409e6c5845f1f349df8cd84e160bf6f1c35d2b060b63e1f032f9bd39d4542cc.zip",
+          "objectKey": "5d8d1d0aacea23824c62f362e1e3c14b7dd14a31c71b53bfae4d14a6373c5510.zip",
           "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
         }
       }
@@ -92,28 +92,28 @@
         }
       }
     },
-    "95c924c84f5d023be4edee540cb2cb401a49f115d01ed403b288f6cb412771df": {
+    "4083400addc1de83cd1be06b8d7b1a4f52b08ce4cbcaf1247516d9c1d7668d47": {
       "source": {
-        "path": "asset.95c924c84f5d023be4edee540cb2cb401a49f115d01ed403b288f6cb412771df.zip",
+        "path": "asset.4083400addc1de83cd1be06b8d7b1a4f52b08ce4cbcaf1247516d9c1d7668d47.zip",
         "packaging": "file"
       },
       "destinations": {
         "current_account-current_region": {
           "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
-          "objectKey": "95c924c84f5d023be4edee540cb2cb401a49f115d01ed403b288f6cb412771df.zip",
+          "objectKey": "4083400addc1de83cd1be06b8d7b1a4f52b08ce4cbcaf1247516d9c1d7668d47.zip",
           "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
         }
       }
     },
-    "5a90142a26cd47112a4ae6b1bffc9a010dcd93aa3619646459686478b12576cf": {
+    "64975905aca20e342092cbeafd7b7c6f276ab76ba29d79a88c8ace664f6f91b4": {
       "source": {
         "path": "integ-servicecatalog-product.template.json",
         "packaging": "file"
       },
       "destinations": {
         "current_account-current_region": {
           "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
-          "objectKey": "5a90142a26cd47112a4ae6b1bffc9a010dcd93aa3619646459686478b12576cf.json",
+          "objectKey": "64975905aca20e342092cbeafd7b7c6f276ab76ba29d79a88c8ace664f6f91b4.json",
           "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
         }
       }

diff --git a/...-servicecatalog/test/integ.product.js.snapshot/integ-servicecatalog-product.template.json b/...-servicecatalog/test/integ.product.js.snapshot/integ-servicecatalog-product.template.json
@@ -1,5 +1,25 @@
 {
  "Resources": {
+  "TestPortfolio4AC794EB": {
+   "Type": "AWS::ServiceCatalog::Portfolio",
+   "Properties": {
+    "DisplayName": "TestPortfolio",
+    "ProviderName": "TestProvider",
+    "AcceptLanguage": "en",
+    "Description": "This is our Service Catalog Portfolio"
+   }
+  },
+  "TestPortfolioPortfolioProductAssociation9c99ebba36fc70F2C75A": {
+   "Type": "AWS::ServiceCatalog::PortfolioProductAssociation",
+   "Properties": {
+    "PortfolioId": {
+     "Ref": "TestPortfolio4AC794EB"
+    },
+    "ProductId": {
+     "Ref": "TestProduct7606930B"
+    }
+   }
+  },
   "TestAssetBucket9434EFAE": {
    "Type": "AWS::S3::Bucket",
    "Properties": {
@@ -192,7 +212,8 @@
        "LoadTemplateFromURL": {
         "Fn::Sub": "https://s3.${AWS::Region}.${AWS::URLSuffix}/cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/44136fa355b3678a1146ad16f7e8649e94fb4fc21fe77e8310c060f61caaff8a.json"
        }
-      }
+      },
+      "Name": "testAssetProduct"
      },
      {
       "DisableTemplateValidation": false,
@@ -206,71 +227,14 @@
     ]
    }
   },
-  "TestProductTagOptionAssociation0d813eebb333DA3E2F21": {
-   "Type": "AWS::ServiceCatalog::TagOptionAssociation",
-   "Properties": {
-    "ResourceId": {
-     "Ref": "TestProduct7606930B"
-    },
-    "TagOptionId": {
-     "Ref": "TagOptions5f31c54ba705F110F743"
-    }
-   }
-  },
-  "TestProductTagOptionAssociation5d93a5c977b4B664DD87": {
-   "Type": "AWS::ServiceCatalog::TagOptionAssociation",
-   "Properties": {
-    "ResourceId": {
-     "Ref": "TestProduct7606930B"
-    },
-    "TagOptionId": {
-     "Ref": "TagOptions8d263919cebb6764AC10"
-    }
-   }
-  },
-  "TestProductTagOptionAssociationcfaf40b186a3E5FDECDC": {
-   "Type": "AWS::ServiceCatalog::TagOptionAssociation",
-   "Properties": {
-    "ResourceId": {
-     "Ref": "TestProduct7606930B"
-    },
-    "TagOptionId": {
-     "Ref": "TagOptionsa260cbbd99c416C40F73"
-    }
-   }
-  },
-  "TagOptions5f31c54ba705F110F743": {
-   "Type": "AWS::ServiceCatalog::TagOption",
-   "Properties": {
-    "Key": "key1",
-    "Value": "value1",
-    "Active": true
-   }
-  },
-  "TagOptions8d263919cebb6764AC10": {
-   "Type": "AWS::ServiceCatalog::TagOption",
-   "Properties": {
-    "Key": "key1",
-    "Value": "value2",
-    "Active": true
-   }
-  },
-  "TagOptionsa260cbbd99c416C40F73": {
-   "Type": "AWS::ServiceCatalog::TagOption",
-   "Properties": {
-    "Key": "key2",
-    "Value": "value1",
-    "Active": true
-   }
-  },
   "AssetsBucketDeploymentAwsCliLayer9BCEE17F": {
    "Type": "AWS::Lambda::LayerVersion",
    "Properties": {
     "Content": {
      "S3Bucket": {
       "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
      },
-     "S3Key": "c409e6c5845f1f349df8cd84e160bf6f1c35d2b060b63e1f032f9bd39d4542cc.zip"
+     "S3Key": "5d8d1d0aacea23824c62f362e1e3c14b7dd14a31c71b53bfae4d14a6373c5510.zip"
     },
     "Description": "/opt/awscli/aws"
    }
@@ -290,7 +254,7 @@
      }
     ],
     "SourceObjectKeys": [
-     "95c924c84f5d023be4edee540cb2cb401a49f115d01ed403b288f6cb412771df.zip"
+     "4083400addc1de83cd1be06b8d7b1a4f52b08ce4cbcaf1247516d9c1d7668d47.zip"
     ],
     "DestinationBucketName": {
      "Ref": "TestAssetBucket9434EFAE"
@@ -452,6 +416,13 @@
    }
   }
  },
+ "Outputs": {
+  "PortfolioId": {
+   "Value": {
+    "Ref": "TestPortfolio4AC794EB"
+   }
+  }
+ },
  "Parameters": {
   "BootstrapVersion": {
    "Type": "AWS::SSM::Parameter::Value<String>",