i/r/servicecat: Add provisioning artifact ID

coveooss · May 20, 2021 · 1ae618b · 1ae618b
1 parent 69fb63f
commit 1ae618b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/aws/internal/service/servicecatalog/id.go b/aws/internal/service/servicecatalog/id.go
@@ -60,3 +60,15 @@ func TagOptionResourceAssociationParseID(id string) (string, string, error) {
 func TagOptionResourceAssociationID(tagOptionID, resourceID string) string {
 	return strings.Join([]string{tagOptionID, resourceID}, ":")
 }
+
+func ProvisioningArtifactID(artifactID, productID string) string {
+	return strings.Join([]string{artifactID, productID}, ":")
+}
+
+func ProvisioningArtifactParseID(id string) (string, string, error) {
+	parts := strings.Split(id, ":")
+	if len(parts) != 2 {
+		return "", "", fmt.Errorf("Please make sure the ID is in the form artifact_id:product_id (i.e. pa-r2d2slrtcob:prod-c3pohcrhmisy")
+	}
+	return parts[0], parts[1], nil
+}
diff --git a/aws/internal/service/servicecatalog/waiter/waiter.go b/aws/internal/service/servicecatalog/waiter/waiter.go
@@ -42,10 +42,9 @@ const (
 	StatusUnavailable = "UNAVAILABLE"
 
 	// AWS documentation is wrong, says that status will be "AVAILABLE" but it is actually "CREATED"
-	ProductStatusCreated = "CREATED"
+	StatusCreated = "CREATED"
 
 	OrganizationAccessStatusError = "ERROR"
-	StatusCreated                 = "CREATED"
 )
 
 func ProductReady(conn *servicecatalog.ServiceCatalog, acceptLanguage, productID string) (*servicecatalog.DescribeProductAsAdminOutput, error) {