Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

r/aws_batch_compute_environment: Enforce no compute_resources block for UNMANAGED compute environments #22805

Merged
merged 2 commits into from
Feb 2, 2022
Merged

r/aws_batch_compute_environment: Enforce no compute_resources block for UNMANAGED compute environments #22805

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8caaf31
r/aws_batch_compute_environment: Enforce no compute_resources block f…
ewbankkit Jan 27, 2022
1ccf664
Add CHANGELOG entry.
ewbankkit Jan 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .changelog/22805.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:breaking-change
resource/aws_batch_compute_environment: No `compute_resources` configuration block can be specified when `type` is `UNMANAGED`
```
29 changes: 14 additions & 15 deletions internal/service/batch/compute_environment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,12 +248,8 @@ func resourceComputeEnvironmentCreate(d *schema.ResourceData, meta interface{})
Type: aws.String(computeEnvironmentType),
}

// TODO Check in CustomizeDiff that UNMANAGED compute environment has no compute_resources.
// TODO This would be a breaking change.
if computeEnvironmentType := strings.ToUpper(computeEnvironmentType); computeEnvironmentType == batch.CETypeManaged {
if v, ok := d.GetOk("compute_resources"); ok && len(v.([]interface{})) > 0 && v.([]interface{})[0] != nil {
input.ComputeResources = expandBatchComputeResource(v.([]interface{})[0].(map[string]interface{}))
}
if v, ok := d.GetOk("compute_resources"); ok && len(v.([]interface{})) > 0 && v.([]interface{})[0] != nil {
input.ComputeResources = expandBatchComputeResource(v.([]interface{})[0].(map[string]interface{}))
}

if v, ok := d.GetOk("state"); ok {
Expand Down Expand Up @@ -309,15 +305,12 @@ func resourceComputeEnvironmentRead(d *schema.ResourceData, meta interface{}) er
d.Set("status_reason", computeEnvironment.StatusReason)
d.Set("type", computeEnvironmentType)

// TODO See above on how to remove check on type.
if computeEnvironmentType == batch.CETypeManaged {
if computeEnvironment.ComputeResources != nil {
if err := d.Set("compute_resources", []interface{}{flattenBatchComputeResource(computeEnvironment.ComputeResources)}); err != nil {
return fmt.Errorf("error setting compute_resources: %w", err)
}
} else {
d.Set("compute_resources", nil)
if computeEnvironment.ComputeResources != nil {
if err := d.Set("compute_resources", []interface{}{flattenBatchComputeResource(computeEnvironment.ComputeResources)}); err != nil {
return fmt.Errorf("error setting compute_resources: %w", err)
}
} else {
d.Set("compute_resources", nil)
}

tags := KeyValueTags(computeEnvironment.Tags).IgnoreAWS().IgnoreConfig(ignoreTagsConfig)
Expand Down Expand Up @@ -350,7 +343,6 @@ func resourceComputeEnvironmentUpdate(d *schema.ResourceData, meta interface{})
input.State = aws.String(d.Get("state").(string))
}

// TODO See above on how to remove check on type.
if computeEnvironmentType := strings.ToUpper(d.Get("type").(string)); computeEnvironmentType == batch.CETypeManaged {
// "At least one compute-resources attribute must be specified"
computeResourceUpdate := &batch.ComputeResourceUpdate{
Expand Down Expand Up @@ -435,6 +427,13 @@ func resourceComputeEnvironmentDelete(d *schema.ResourceData, meta interface{})
}

func resourceComputeEnvironmentCustomizeDiff(_ context.Context, diff *schema.ResourceDiff, meta interface{}) error {
if computeEnvironmentType := strings.ToUpper(diff.Get("type").(string)); computeEnvironmentType == batch.CETypeUnmanaged {
// UNMANAGED compute environments can have no compute_resources configured.
if v, ok := diff.GetOk("compute_resources"); ok && len(v.([]interface{})) > 0 && v.([]interface{})[0] != nil {
return fmt.Errorf("no `compute_resources` can be specified when `type` is %q", computeEnvironmentType)
}
}

if diff.Id() != "" {
// Update.

Expand Down
21 changes: 2 additions & 19 deletions internal/service/batch/compute_environment_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1324,10 +1324,7 @@ func TestAccBatchComputeEnvironment_tags(t *testing.T) {
}

func TestAccBatchComputeEnvironment_createUnmanagedWithComputeResources(t *testing.T) {
var ce batch.ComputeEnvironmentDetail
rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
resourceName := "aws_batch_compute_environment.test"
serviceRoleResourceName := "aws_iam_role.batch_service"

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { acctest.PreCheck(t); testAccPreCheck(t) },
Expand All @@ -1336,23 +1333,9 @@ func TestAccBatchComputeEnvironment_createUnmanagedWithComputeResources(t *testi
CheckDestroy: testAccCheckBatchComputeEnvironmentDestroy,
Steps: []resource.TestStep{
{
Config: testAccComputeEnvironmentUnmanagedWithComputeResourcesConfig(rName),
Check: resource.ComposeTestCheckFunc(
testAccCheckComputeEnvironmentExists(resourceName, &ce),
acctest.CheckResourceAttrRegionalARN(resourceName, "arn", "batch", fmt.Sprintf("compute-environment/%s", rName)),
resource.TestCheckResourceAttr(resourceName, "compute_environment_name", rName),
resource.TestCheckResourceAttr(resourceName, "compute_environment_name_prefix", ""),
resource.TestCheckResourceAttr(resourceName, "compute_resources.#", "1"),
resource.TestCheckResourceAttrSet(resourceName, "ecs_cluster_arn"),
resource.TestCheckResourceAttrPair(resourceName, "service_role", serviceRoleResourceName, "arn"),
resource.TestCheckResourceAttr(resourceName, "state", "ENABLED"),
resource.TestCheckResourceAttrSet(resourceName, "status"),
resource.TestCheckResourceAttrSet(resourceName, "status_reason"),
resource.TestCheckResourceAttr(resourceName, "tags.%", "0"),
resource.TestCheckResourceAttr(resourceName, "type", "UNMANAGED"),
),
Config: testAccComputeEnvironmentUnmanagedWithComputeResourcesConfig(rName),
ExpectError: regexp.MustCompile("no `compute_resources` can be specified when `type` is \"UNMANAGED\""),
},
// Can't import in this scenario.
},
})
}
Expand Down