r/servicecatalog_service_action: New resource

.changelog/19369.txt

@@ -0,0 +1,3 @@
+```release-note:new-resource
+aws_servicecatalog_service_action
+```

aws/diff_suppress_funcs.go

@@ -82,6 +82,18 @@ func suppressEquivalentJsonDiffs(k, old, new string, d *schema.ResourceData) boo
 	return jsonBytesEqual(ob.Bytes(), nb.Bytes())
 }
 
+func suppressEquivalentJsonEmptyNilDiffs(k, old, new string, d *schema.ResourceData) bool {
+	if old == "[]" && new == "" {
+		return true
+	}
+
+	if old == "" && new == "[]" {
+		return true
+	}
+
+	return suppressEquivalentJsonDiffs(k, old, new, d)
+}
+
 func suppressOpenIdURL(k, old, new string, d *schema.ResourceData) bool {
 	oldUrl, err := url.Parse(old)
 	if err != nil {

aws/internal/service/servicecatalog/waiter/status.go

@@ -131,6 +131,7 @@ func OrganizationsAccessStatus(conn *servicecatalog.ServiceCatalog) resource.Sta
 		}
 
 		if err != nil {
+
 			return nil, OrganizationAccessStatusError, fmt.Errorf("error getting Organizations Access: %w", err)
 		}
 
@@ -197,3 +198,31 @@ func ProductPortfolioAssociationStatus(conn *servicecatalog.ServiceCatalog, acce
 		return output, servicecatalog.StatusAvailable, err
 	}
 }
+
+func ServiceActionStatus(conn *servicecatalog.ServiceCatalog, acceptLanguage, id string) resource.StateRefreshFunc {
+	return func() (interface{}, string, error) {
+		input := &servicecatalog.DescribeServiceActionInput{
+			Id: aws.String(id),
+		}
+
+		if acceptLanguage != "" {
+			input.AcceptLanguage = aws.String(acceptLanguage)
+		}
+
+		output, err := conn.DescribeServiceAction(input)
+
+		if tfawserr.ErrCodeEquals(err, servicecatalog.ErrCodeResourceNotFoundException) {
+			return nil, StatusNotFound, err
+		}
+
+		if err != nil {
+			return nil, servicecatalog.StatusFailed, fmt.Errorf("error describing Service Action: %w", err)
+		}
+
+		if output == nil || output.ServiceActionDetail == nil {
+			return nil, StatusUnavailable, fmt.Errorf("error describing Service Action: empty Service Action Detail")
+		}
+
+		return output.ServiceActionDetail, servicecatalog.StatusAvailable, nil
+	}
+}

aws/internal/service/servicecatalog/waiter/waiter.go

@@ -26,6 +26,9 @@ const (
 	ProductPortfolioAssociationReadyTimeout  = 3 * time.Minute
 	ProductPortfolioAssociationDeleteTimeout = 3 * time.Minute
 
+	ServiceActionReadyTimeout  = 3 * time.Minute
+	ServiceActionDeleteTimeout = 3 * time.Minute
+
 	StatusNotFound    = "NOT_FOUND"
 	StatusUnavailable = "UNAVAILABLE"
 
@@ -263,3 +266,37 @@ func ProductPortfolioAssociationDeleted(conn *servicecatalog.ServiceCatalog, acc
 
 	return err
 }
+
+func ServiceActionReady(conn *servicecatalog.ServiceCatalog, acceptLanguage, id string) (*servicecatalog.ServiceActionDetail, error) {
+	stateConf := &resource.StateChangeConf{
+		Pending: []string{StatusNotFound, StatusUnavailable},
+		Target:  []string{servicecatalog.StatusAvailable},
+		Refresh: ServiceActionStatus(conn, acceptLanguage, id),
+		Timeout: ServiceActionReadyTimeout,
+	}
+
+	outputRaw, err := stateConf.WaitForState()
+
+	if output, ok := outputRaw.(*servicecatalog.ServiceActionDetail); ok {
+		return output, err
+	}
+
+	return nil, err
+}
+
+func ServiceActionDeleted(conn *servicecatalog.ServiceCatalog, acceptLanguage, id string) error {
+	stateConf := &resource.StateChangeConf{
+		Pending: []string{servicecatalog.StatusAvailable},
+		Target:  []string{StatusNotFound, StatusUnavailable},
+		Refresh: ServiceActionStatus(conn, acceptLanguage, id),
+		Timeout: ServiceActionDeleteTimeout,
+	}
+
+	_, err := stateConf.WaitForState()
+
+	if tfawserr.ErrCodeEquals(err, servicecatalog.ErrCodeResourceNotFoundException) {
+		return nil
+	}
+
+	return err
+}

aws/provider.go

@@ -1025,6 +1025,7 @@ func Provider() *schema.Provider {
 			"aws_servicecatalog_portfolio":                            resourceAwsServiceCatalogPortfolio(),
 			"aws_servicecatalog_portfolio_share":                      resourceAwsServiceCatalogPortfolioShare(),
 			"aws_servicecatalog_product":                              resourceAwsServiceCatalogProduct(),
+			"aws_servicecatalog_service_action":                       resourceAwsServiceCatalogServiceAction(),
 			"aws_servicecatalog_tag_option":                           resourceAwsServiceCatalogTagOption(),
 			"aws_servicecatalog_product_portfolio_association":        resourceAwsServiceCatalogProductPortfolioAssociation(),
 			"aws_service_discovery_http_namespace":                    resourceAwsServiceDiscoveryHttpNamespace(),