Merge pull request #19432 from hashicorp/f-apprunner-service-resources

Implement AWS App Runner resources

.changelog/19432.txt

@@ -0,0 +1,15 @@
+```release-note:new-resource
+aws_apprunner_auto_scaling_configuration_version
+```
+
+```release-note:new-resource
+aws_apprunner_connection
+```
+
+```release-note:new-resource
+aws_apprunner_custom_domain_association
+```
+
+```release-note:new-resource
+aws_apprunner_service
+```

.hashibot.hcl

@@ -132,6 +132,9 @@ behavior "regexp_issue_labeler_v2" "service_labels" {
     "service/appmesh" = [
       "aws_appmesh_",
     ],
+    "service/apprunner" = [
+      "aws_apprunner_",
+    ],
     "service/appstream" = [
       "aws_appstream_",
     ],
@@ -741,6 +744,11 @@ behavior "pull_request_path_labeler" "service_labels" {
       "**/*_appmesh_*",
       "**/appmesh_*"
     ]
+    "service/apprunner" = [
+      "aws/internal/service/apprunner/**/*",
+      "**/*_apprunner_*",
+      "**/apprunner_*"
+    ]
     "service/appstream" = [
       "aws/internal/service/appstream/**/*",
       "**/*_appstream_*",

aws/config.go

@@ -18,6 +18,7 @@ import (
 	"github.com/aws/aws-sdk-go/service/applicationautoscaling"
 	"github.com/aws/aws-sdk-go/service/applicationinsights"
 	"github.com/aws/aws-sdk-go/service/appmesh"
+	"github.com/aws/aws-sdk-go/service/apprunner"
 	"github.com/aws/aws-sdk-go/service/appstream"
 	"github.com/aws/aws-sdk-go/service/appsync"
 	"github.com/aws/aws-sdk-go/service/athena"
@@ -221,6 +222,7 @@ type AWSClient struct {
 	appconfigconn                       *appconfig.AppConfig
 	applicationinsightsconn             *applicationinsights.ApplicationInsights
 	appmeshconn                         *appmesh.AppMesh
+	apprunnerconn                       *apprunner.AppRunner
 	appstreamconn                       *appstream.AppStream
 	appsyncconn                         *appsync.AppSync
 	athenaconn                          *athena.Athena
@@ -468,6 +470,7 @@ func (c *Config) Client() (interface{}, error) {
 		appconfigconn:                       appconfig.New(sess.Copy(&aws.Config{Endpoint: aws.String(c.Endpoints["appconfig"])})),
 		applicationinsightsconn:             applicationinsights.New(sess.Copy(&aws.Config{Endpoint: aws.String(c.Endpoints["applicationinsights"])})),
 		appmeshconn:                         appmesh.New(sess.Copy(&aws.Config{Endpoint: aws.String(c.Endpoints["appmesh"])})),
+		apprunnerconn:                       apprunner.New(sess.Copy(&aws.Config{Endpoint: aws.String(c.Endpoints["apprunner"])})),
 		appstreamconn:                       appstream.New(sess.Copy(&aws.Config{Endpoint: aws.String(c.Endpoints["appstream"])})),
 		appsyncconn:                         appsync.New(sess.Copy(&aws.Config{Endpoint: aws.String(c.Endpoints["appsync"])})),
 		athenaconn:                          athena.New(sess.Copy(&aws.Config{Endpoint: aws.String(c.Endpoints["athena"])})),

aws/internal/keyvaluetags/generators/listtags/main.go

@@ -23,6 +23,7 @@ var serviceNames = []string{
 	"amplify",
 	"apigatewayv2",
 	"appmesh",
+	"apprunner",
 	"appstream",
 	"appsync",
 	"athena",

aws/internal/keyvaluetags/generators/servicetags/main.go

@@ -21,6 +21,7 @@ var sliceServiceNames = []string{
 	"acm",
 	"acmpca",
 	"appmesh",
+	"apprunner",
 	"athena",
 	"autoscaling",
 	"cloud9",

aws/internal/keyvaluetags/generators/updatetags/main.go

@@ -24,6 +24,7 @@ var serviceNames = []string{
 	"apigateway",
 	"apigatewayv2",
 	"appmesh",
+	"apprunner",
 	"appstream",
 	"appsync",
 	"athena",

aws/internal/keyvaluetags/service_generation_customizations.go

@@ -13,6 +13,7 @@ import (
 	"github.com/aws/aws-sdk-go/service/apigateway"
 	"github.com/aws/aws-sdk-go/service/apigatewayv2"
 	"github.com/aws/aws-sdk-go/service/appmesh"
+	"github.com/aws/aws-sdk-go/service/apprunner"
 	"github.com/aws/aws-sdk-go/service/appstream"
 	"github.com/aws/aws-sdk-go/service/appsync"
 	"github.com/aws/aws-sdk-go/service/athena"
@@ -146,6 +147,8 @@ func ServiceClientType(serviceName string) string {
 		funcType = reflect.TypeOf(apigatewayv2.New)
 	case "appmesh":
 		funcType = reflect.TypeOf(appmesh.New)
+	case "apprunner":
+		funcType = reflect.TypeOf(apprunner.New)
 	case "appstream":
 		funcType = reflect.TypeOf(appstream.New)
 	case "appsync":

aws/internal/service/apprunner/finder/finder.go

@@ -0,0 +1,82 @@
+package finder
+
+import (
+	"context"
+
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/service/apprunner"
+)
+
+func ConnectionSummaryByName(ctx context.Context, conn *apprunner.AppRunner, name string) (*apprunner.ConnectionSummary, error) {
+	input := &apprunner.ListConnectionsInput{
+		ConnectionName: aws.String(name),
+	}
+
+	var cs *apprunner.ConnectionSummary
+
+	err := conn.ListConnectionsPagesWithContext(ctx, input, func(page *apprunner.ListConnectionsOutput, lastPage bool) bool {
+		if page == nil {
+			return !lastPage
+		}
+
+		for _, c := range page.ConnectionSummaryList {
+			if c == nil {
+				continue
+			}
+
+			if aws.StringValue(c.ConnectionName) == name {
+				cs = c
+				return false
+			}
+		}
+
+		return !lastPage
+	})
+
+	if err != nil {
+		return nil, err
+	}
+
+	if cs == nil {
+		return nil, nil
+	}
+
+	return cs, nil
+}
+
+func CustomDomain(ctx context.Context, conn *apprunner.AppRunner, domainName, serviceArn string) (*apprunner.CustomDomain, error) {
+	input := &apprunner.DescribeCustomDomainsInput{
+		ServiceArn: aws.String(serviceArn),
+	}
+
+	var customDomain *apprunner.CustomDomain
+
+	err := conn.DescribeCustomDomainsPagesWithContext(ctx, input, func(page *apprunner.DescribeCustomDomainsOutput, lastPage bool) bool {
+		if page == nil {
+			return !lastPage
+		}
+
+		for _, cd := range page.CustomDomains {
+			if cd == nil {
+				continue
+			}
+
+			if aws.StringValue(cd.DomainName) == domainName {
+				customDomain = cd
+				return false
+			}
+		}
+
+		return !lastPage
+	})
+
+	if err != nil {
+		return nil, err
+	}
+
+	if customDomain == nil {
+		return nil, nil
+	}
+
+	return customDomain, nil
+}

aws/internal/service/apprunner/id.go

@@ -0,0 +1,14 @@
+package apprunner
+
+import (
+	"fmt"
+	"strings"
+)
+
+func CustomDomainAssociationParseID(id string) (string, string, error) {
+	idParts := strings.Split(id, ",")
+	if len(idParts) != 2 || idParts[0] == "" || idParts[1] == "" {
+		return "", "", fmt.Errorf("unexpected format of ID (%s), expected domain_name,service_arn", id)
+	}
+	return idParts[0], idParts[1], nil
+}