aws_servicecatalog_product: import latest provisioning_artifact_parameters

.changelog/33448.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_servicecatalog_product: Allow import on `provisioning_artifact_parameters` attribute
+```

internal/service/servicecatalog/find.go

@@ -149,3 +149,24 @@ func FindTagOptionResourceAssociation(ctx context.Context, conn *servicecatalog.
 
 	return result, err
 }
+
+func findProductByID(ctx context.Context, conn *servicecatalog.ServiceCatalog, productID string) (*servicecatalog.DescribeProductAsAdminOutput, error) {
+	in := &servicecatalog.DescribeProductAsAdminInput{
+		Id: aws.String(productID),
+	}
+
+	out, err := conn.DescribeProductAsAdminWithContext(ctx, in)
+
+	if tfawserr.ErrCodeEquals(err, servicecatalog.ErrCodeResourceNotFoundException) {
+		return nil, &retry.NotFoundError{
+			LastError:   err,
+			LastRequest: in,
+		}
+	}
+
+	if err != nil {
+		return nil, err
+	}
+
+	return out, nil
+}

internal/service/servicecatalog/product.go

@@ -6,6 +6,7 @@ package servicecatalog
 import (
 	"context"
 	"log"
+	"sort"
 	"time"
 
 	"github.com/aws/aws-sdk-go/aws"
@@ -34,7 +35,7 @@ func ResourceProduct() *schema.Resource {
 		DeleteWithoutTimeout: resourceProductDelete,
 
 		Importer: &schema.ResourceImporter{
-			StateContext: schema.ImportStatePassthroughContext,
+			StateContext: resourceProductImport,
 		},
 
 		Timeouts: &schema.ResourceTimeout{
@@ -163,6 +164,40 @@ func ResourceProduct() *schema.Resource {
 	}
 }
 
+func resourceProductImport(ctx context.Context, d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
+	conn := meta.(*conns.AWSClient).ServiceCatalogConn(ctx)
+
+	productData, err := findProductByID(ctx, conn, d.Id())
+
+	if err != nil {
+		return []*schema.ResourceData{d}, err
+	}
+
+	// import the last entry in the summary
+	if len(productData.ProvisioningArtifactSummaries) > 0 {
+		sort.Slice(productData.ProvisioningArtifactSummaries, func(i, j int) bool {
+			return aws.TimeValue(productData.ProvisioningArtifactSummaries[i].CreatedTime).Before(aws.TimeValue(productData.ProvisioningArtifactSummaries[j].CreatedTime))
+		})
+
+		provisioningArtifact := productData.ProvisioningArtifactSummaries[len(productData.ProvisioningArtifactSummaries)-1]
+		in := &servicecatalog.DescribeProvisioningArtifactInput{
+			ProductId:              aws.String(d.Id()),
+			ProvisioningArtifactId: provisioningArtifact.Id,
+		}
+
+		// Find additional artifact details.
+		artifactData, err := conn.DescribeProvisioningArtifactWithContext(ctx, in)
+
+		if err != nil {
+			return []*schema.ResourceData{d}, err
+		}
+
+		d.Set("provisioning_artifact_parameters", flattenProvisioningArtifactParameters(artifactData))
+	}
+
+	return []*schema.ResourceData{d}, nil
+}
+
 func resourceProductCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
 	var diags diag.Diagnostics
 	conn := meta.(*conns.AWSClient).ServiceCatalogConn(ctx)
@@ -433,3 +468,28 @@ func expandProvisioningArtifactParameters(tfMap map[string]interface{}) *service
 
 	return apiObject
 }
+
+func flattenProvisioningArtifactParameters(apiObject *servicecatalog.DescribeProvisioningArtifactOutput) []interface{} {
+	if apiObject == nil {
+		return nil
+	}
+
+	m := map[string]interface{}{
+		"description":                 aws.StringValue(apiObject.ProvisioningArtifactDetail.Description),
+		"disable_template_validation": false, // set default because it cannot be read
+		"name":                        aws.StringValue(apiObject.ProvisioningArtifactDetail.Name),
+		"type":                        aws.StringValue(apiObject.ProvisioningArtifactDetail.Type),
+	}
+
+	if apiObject.Info != nil {
+		if v, ok := apiObject.Info["TemplateUrl"]; ok {
+			m["template_url"] = aws.StringValue(v)
+		}
+
+		if v, ok := apiObject.Info["PhysicalId"]; ok {
+			m["template_physical_id"] = aws.StringValue(v)
+		}
+	}
+
+	return []interface{}{m}
+}

internal/service/servicecatalog/product_test.go

@@ -68,7 +68,7 @@ func TestAccServiceCatalogProduct_basic(t *testing.T) {
 				ImportStateVerify: true,
 				ImportStateVerifyIgnore: []string{
 					"accept_language",
-					"provisioning_artifact_parameters",
+					"provisioning_artifact_parameters.0.disable_template_validation",
 				},
 			},
 		},
@@ -208,7 +208,7 @@ func TestAccServiceCatalogProduct_physicalID(t *testing.T) {
 				ImportStateVerify: true,
 				ImportStateVerifyIgnore: []string{
 					"accept_language",
-					"provisioning_artifact_parameters",
+					"provisioning_artifact_parameters.0.disable_template_validation",
 				},
 			},
 		},