Merge pull request #43136 from stefanfreitag/f-aws_amplify_app-add-build-compute-type

feat: add support for job_config

Author: ewbankkit

.changelog/43136.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_amplify_app: Add `job_config` argument
+```

internal/service/amplify/amplify_test.go

@@ -30,6 +30,7 @@ func TestAccAmplify_serial(t *testing.T) {
 			"Description":              testAccApp_Description,
 			"EnvironmentVariables":     testAccApp_EnvironmentVariables,
 			"IamServiceRole":           testAccApp_IAMServiceRole,
+			"JobConfig":                testAccApp_JobConfig,
 			"Name":                     testAccApp_Name,
 			"Repository":               testAccApp_Repository,
 		},

internal/service/amplify/app.go

@@ -265,6 +265,22 @@ func resourceApp() *schema.Resource {
 				Optional:     true,
 				ValidateFunc: verify.ValidARN,
 			},
+			"job_config": {
+				Type:     schema.TypeList,
+				Optional: true,
+				Computed: true,
+				MaxItems: 1,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"build_compute_type": {
+							Type:             schema.TypeString,
+							Optional:         true,
+							Computed:         true,
+							ValidateDiagFunc: enum.Validate[types.BuildComputeType](),
+						},
+					},
+				},
+			},
 			names.AttrName: {
 				Type:         schema.TypeString,
 				Required:     true,
@@ -391,6 +407,10 @@ func resourceAppCreate(ctx context.Context, d *schema.ResourceData, meta any) di
 		input.IamServiceRoleArn = aws.String(v.(string))
 	}
 
+	if v, ok := d.GetOk("job_config"); ok && len(v.([]any)) > 0 && v.([]any)[0] != nil {
+		input.JobConfig = expandJobConfig(v.([]any)[0].(map[string]any))
+	}
+
 	if v, ok := d.GetOk("oauth_token"); ok {
 		input.OauthToken = aws.String(v.(string))
 	}
@@ -461,6 +481,13 @@ func resourceAppRead(ctx context.Context, d *schema.ResourceData, meta any) diag
 	d.Set("enable_branch_auto_deletion", app.EnableBranchAutoDeletion)
 	d.Set("environment_variables", aws.StringMap(app.EnvironmentVariables))
 	d.Set("iam_service_role_arn", app.IamServiceRoleArn)
+	if app.JobConfig != nil {
+		if err := d.Set("job_config", []any{flattenJobConfig(app.JobConfig)}); err != nil {
+			return sdkdiag.AppendErrorf(diags, "setting job_config: %s", err)
+		}
+	} else {
+		d.Set("job_config", nil)
+	}
 	d.Set(names.AttrName, app.Name)
 	d.Set("platform", app.Platform)
 	if app.ProductionBranch != nil {
@@ -571,6 +598,12 @@ func resourceAppUpdate(ctx context.Context, d *schema.ResourceData, meta any) di
 			input.IamServiceRoleArn = aws.String(d.Get("iam_service_role_arn").(string))
 		}
 
+		if d.HasChange("job_config") {
+			if v, ok := d.Get("job_config").([]any); ok && len(v) > 0 && v[0] != nil {
+				input.JobConfig = expandJobConfig(v[0].(map[string]any))
+			}
+		}
+
 		if d.HasChange(names.AttrName) {
 			input.Name = aws.String(d.Get(names.AttrName).(string))
 		}
@@ -818,6 +851,20 @@ func expandCustomRules(tfList []any) []types.CustomRule {
 	return apiObjects
 }
 
+func expandJobConfig(tfMap map[string]any) *types.JobConfig {
+	if tfMap == nil {
+		return nil
+	}
+
+	apiObject := &types.JobConfig{}
+
+	if v, ok := tfMap["build_compute_type"].(string); ok && v != "" {
+		apiObject.BuildComputeType = types.BuildComputeType(v)
+	}
+
+	return apiObject
+}
+
 func flattenCustomRule(apiObject types.CustomRule) map[string]any {
 	tfMap := map[string]any{}
 
@@ -854,6 +901,18 @@ func flattenCustomRules(apiObjects []types.CustomRule) []any {
 	return tfList
 }
 
+func flattenJobConfig(apiObject *types.JobConfig) map[string]any {
+	if apiObject == nil {
+		return nil
+	}
+
+	tfMap := map[string]any{}
+
+	tfMap["build_compute_type"] = string(apiObject.BuildComputeType)
+
+	return tfMap
+}
+
 func flattenProductionBranch(apiObject *types.ProductionBranch) map[string]any {
 	if apiObject == nil {
 		return nil

internal/service/amplify/app_test.go

@@ -47,7 +47,7 @@ func testAccApp_basic(t *testing.T) {
 					resource.TestCheckResourceAttr(resourceName, "basic_auth_credentials", ""),
 					resource.TestCheckResourceAttr(resourceName, "build_spec", ""),
 					resource.TestCheckResourceAttr(resourceName, "cache_config.#", "1"),
-					resource.TestCheckResourceAttr(resourceName, "cache_config.0.type", "AMPLIFY_MANAGED"),
+					resource.TestCheckResourceAttr(resourceName, "cache_config.0.type", "AMPLIFY_MANAGED_NO_COOKIES"),
 					resource.TestCheckResourceAttr(resourceName, "compute_role_arn", ""),
 					resource.TestCheckResourceAttr(resourceName, "custom_headers", ""),
 					resource.TestCheckResourceAttr(resourceName, "custom_rule.#", "0"),
@@ -59,6 +59,8 @@ func testAccApp_basic(t *testing.T) {
 					resource.TestCheckResourceAttr(resourceName, "enable_branch_auto_deletion", acctest.CtFalse),
 					resource.TestCheckResourceAttr(resourceName, "environment_variables.%", "0"),
 					resource.TestCheckResourceAttr(resourceName, "iam_service_role_arn", ""),
+					resource.TestCheckResourceAttr(resourceName, "job_config.#", "1"),
+					resource.TestCheckResourceAttr(resourceName, "job_config.0.build_compute_type", "STANDARD_8GB"),
 					resource.TestCheckResourceAttr(resourceName, names.AttrName, rName),
 					resource.TestCheckNoResourceAttr(resourceName, "oauth_token"),
 					resource.TestCheckResourceAttr(resourceName, "platform", "WEB"),
@@ -432,6 +434,43 @@ func testAccApp_CustomRules(t *testing.T) {
 	})
 }
 
+func testAccApp_JobConfig(t *testing.T) {
+	ctx := acctest.Context(t)
+	var app types.App
+	rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
+	resourceName := "aws_amplify_app.test"
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:                 func() { acctest.PreCheck(ctx, t); testAccPreCheck(t) },
+		ErrorCheck:               acctest.ErrorCheck(t, names.AmplifyServiceID),
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
+		CheckDestroy:             testAccCheckAppDestroy(ctx),
+		Steps: []resource.TestStep{
+			{
+				Config: testAccAppConfig_jobConfig(rName, "LARGE_16GB"),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckAppExists(ctx, resourceName, &app),
+					resource.TestCheckResourceAttr(resourceName, "job_config.#", "1"),
+					resource.TestCheckResourceAttr(resourceName, "job_config.0.build_compute_type", "LARGE_16GB"),
+				),
+			},
+			{
+				ResourceName:      resourceName,
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+			{
+				Config: testAccAppConfig_jobConfig(rName, "STANDARD_8GB"),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckAppExists(ctx, resourceName, &app),
+					resource.TestCheckResourceAttr(resourceName, "job_config.#", "1"),
+					resource.TestCheckResourceAttr(resourceName, "job_config.0.build_compute_type", "STANDARD_8GB"),
+				),
+			},
+		},
+	})
+}
+
 func testAccApp_Description(t *testing.T) {
 	ctx := acctest.Context(t)
 	var app types.App
@@ -1038,3 +1077,15 @@ resource "aws_amplify_app" "test" {
 }
 `, rName, repository, accessToken)
 }
+
+func testAccAppConfig_jobConfig(rName, buildComputeType string) string {
+	return fmt.Sprintf(`
+resource "aws_amplify_app" "test" {
+  name = %[1]q
+
+  job_config {
+    build_compute_type = %[2]q
+  }
+}
+`, rName, buildComputeType)
+}

website/docs/r/amplify_app.html.markdown

@@ -160,6 +160,18 @@ resource "aws_amplify_app" "example" {
 }
 ```
 
+### Job Config
+
+```terraform
+resource "aws_amplify_app" "example" {
+  name = "example"
+
+  job_config {
+    build_compute_type = "STANDARD_8GB"
+  }
+}
+```
+
 ## Argument Reference
 
 This resource supports the following arguments:
@@ -182,6 +194,7 @@ This resource supports the following arguments:
 * `enable_branch_auto_deletion` - (Optional) Automatically disconnects a branch in the Amplify Console when you delete a branch from your Git repository.
 * `environment_variables` - (Optional) Environment variables map for an Amplify app.
 * `iam_service_role_arn` - (Optional) AWS Identity and Access Management (IAM) service role for an Amplify app.
+* `job_config` - (Optional) Used to configure the [Amplify Application build settings](https://docs.aws.amazon.com/amplify/latest/userguide/build-settings.html). See [`job_config` Block](#job_config-block) for details.
 * `oauth_token` - (Optional) OAuth token for a third-party source control system for an Amplify app. The OAuth token is used to create a webhook and a read-only deploy key. The OAuth token is not stored.
 * `platform` - (Optional) Platform or framework for an Amplify app. Valid values: `WEB`, `WEB_COMPUTE`. Default value: `WEB`.
 * `repository` - (Optional) Repository for an Amplify app.
@@ -217,6 +230,12 @@ The `custom_rule` configuration block supports the following arguments:
 * `status` - (Optional) Status code for a URL rewrite or redirect rule. Valid values: `200`, `301`, `302`, `404`, `404-200`.
 * `target` - (Required) Target pattern for a URL rewrite or redirect rule.
 
+### `job_config` Block
+
+The `job_config` configuration block supports the following arguments:
+
+* `build_compute_type` - (Optional) Size of the build instance. Valid values: `STANDARD_8GB`, `LARGE_16GB`, and `XLARGE_72GB`. Default: `STANDARD_8GB`.
+
 ## Attribute Reference
 
 This resource exports the following attributes in addition to the arguments above: