Closes #3004: adds support for modifying Beanstalk tags #3513

ctreatma · 2018-02-24T20:17:51Z

The Elastic Beanstalk environment resource did not support updating
tags on an existing environment, forcing the use of other tools to
manage environment tags.

The Elastic Beanstalk API now supports updating tags via a separate
UpdateTagsForResource call. This updates the terraform resource
to make an UpdateTagsForResource call whenever there are changes
to the tags attribute.

The Elastic Beanstalk environment resource did not support updating tags on an existing environment, forcing the use of other tools to manage environment tags. The Elastic Beanstalk API now supports updating tags via a separate `UpdateTagsForResource` call. This updates the terraform resource to make an `UpdateTagsForResource` call whenever there are changes to the `tags` attribute.

bflad

Hi @ctreatma, thanks for this contribution! Can you see my comments below and let me know if you have any questions or do not have time to finish this?

In addition to the below, we should definitely add an acceptance test to ensure that tag updates occur as expected in AWS and within Terraform as well (no perpetual updates or errors on update). We can copy a similar acceptance test with updates like TestAccAWSBeanstalkEnv_config and make the new test configurations have tag updates.

Once these are in place, I'll run the full acceptance testing for Beanstalk to verify things. Thanks!

bflad · 2018-02-25T04:39:24Z

aws/resource_aws_elastic_beanstalk_environment.go

@@ -496,6 +562,10 @@ func resourceAwsElasticBeanstalkEnvironmentRead(d *schema.ResourceData, meta int
 return err
 }

+ if err := d.Set("arn", env.EnvironmentArn); err != nil {


Nitpick: Unfortunately the code around it does not follow the convention, but for simple string attributes, we do not need the err handling logic.

d.Set("arn", env.EnvironmentArn)

bflad · 2018-02-25T04:41:39Z

aws/resource_aws_elastic_beanstalk_environment.go

+ ResourceArn: aws.String(d.Get("arn").(string)),
+ }
+
+ if d.HasChange("tags") {


Can you move all the tag update logic inside this conditional here? We do not need to make this more complicated by spreading the logic everywhere like the other update call (which needs to build up arguments).

bflad · 2018-02-25T04:48:09Z

aws/resource_aws_elastic_beanstalk_environment.go

@@ -56,6 +56,10 @@ func resourceAwsElasticBeanstalkEnvironment() *schema.Resource {
 MigrateState: resourceAwsElasticBeanstalkEnvironmentMigrateState,

 Schema: map[string]*schema.Schema{
+ "arn": {


We should ensure this new attribute has an associated test of some sort in TestAccAWSBeanstalkEnv_basic:

resource.TestCheckResourceAttrSet("aws_elastic_beanstalk_environment.tfenvtest", "arn"), # or preferably resource.TestMatchResourceAttr("aws_elastic_beanstalk_environment.tfenvtest", "arn", regexp.MustCompile(fmt.Sprintf("^arn:[^:]+:elasticbeanstalk:[^:]+:[^:]+:environment/%s/%s$", appName, envName)),

ctreatma · 2018-02-25T21:40:53Z

Thanks for the feedback! I should be able to address your suggestions in the next couple days.

ctreatma · 2018-02-28T21:26:39Z

Hi, @bflad. I think I got everything in place for the acceptance tests. Please let me know if there's anything I missed or if there are things I can clean up. Thanks!

bflad · 2018-02-28T21:56:59Z

aws/resource_aws_elastic_beanstalk_environment_test.go

@@ -283,6 +287,49 @@ func TestAccAWSBeanstalkEnv_resource(t *testing.T) {
 })
 }

+func TestAccAWSBeanstalkEnv_tags(t *testing.T) {


This is currently failing with:

=== RUN TestAccAWSBeanstalkEnv_tags --- FAIL: TestAccAWSBeanstalkEnv_tags (474.54s) testing.go:513: Step 0 error: Check failed: Check 1/1 error: InvalidParameter: 1 validation error(s) found. - missing required field, ListTagsForResourceInput.ResourceArn.

The first test step needs to include this as the first check so app is correctly populated: testAccCheckBeanstalkEnvExists("aws_elastic_beanstalk_environment.tfenvtest", &app),

FYI you can run the acceptance test locally with make testacc TEST=./aws TESTARGS='-run=TestAccAWSBeanstalkEnv_tags to verify

bflad

LGTM! Thanks! 🚀

12 tests passed (all tests)
=== RUN   TestAccAWSBeanstalkEnv_resource
--- PASS: TestAccAWSBeanstalkEnv_resource (458.83s)
=== RUN   TestAccAWSBeanstalkEnv_outputs
--- PASS: TestAccAWSBeanstalkEnv_outputs (484.02s)
=== RUN   TestAccAWSBeanstalkEnv_cname_prefix
--- PASS: TestAccAWSBeanstalkEnv_cname_prefix (502.23s)
=== RUN   TestAccAWSBeanstalkEnv_vpc
--- PASS: TestAccAWSBeanstalkEnv_vpc (536.74s)
=== RUN   TestAccAWSBeanstalkEnv_config
--- PASS: TestAccAWSBeanstalkEnv_config (552.64s)
=== RUN   TestAccAWSBeanstalkEnv_version_label
--- PASS: TestAccAWSBeanstalkEnv_version_label (567.84s)
=== RUN   TestAccAWSBeanstalkEnv_basic
--- PASS: TestAccAWSBeanstalkEnv_basic (587.85s)
=== RUN   TestAccAWSBeanstalkEnv_tier
--- PASS: TestAccAWSBeanstalkEnv_tier (613.68s)
=== RUN   TestAccAWSBeanstalkEnv_template_change
--- PASS: TestAccAWSBeanstalkEnv_template_change (624.04s)
=== RUN   TestAccAWSBeanstalkEnv_basic_settings_update
--- PASS: TestAccAWSBeanstalkEnv_basic_settings_update (783.48s)
=== RUN   TestAccAWSBeanstalkEnv_tags
--- PASS: TestAccAWSBeanstalkEnv_tags (836.60s)
=== RUN   TestAccAWSBeanstalkEnv_settingWithJsonValue
--- PASS: TestAccAWSBeanstalkEnv_settingWithJsonValue (927.20s)

bflad · 2018-03-09T20:01:40Z

This has been released in version 1.11.0 of the AWS provider. Please see the Terraform documentation on provider versioning or reach out if you need any assistance upgrading.

ghost · 2020-04-07T17:38:12Z

I'm going to lock this issue because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active issues.

If you feel this issue should be reopened, we encourage creating a new issue linking back to this one for added context. Thanks!

ghost added the size/L Managed by automation to categorize the size of a PR. label Feb 24, 2018

bflad added enhancement Requests to existing resources that expand the functionality or scope. service/elasticbeanstalk Issues and PRs that pertain to the elasticbeanstalk service. labels Feb 24, 2018

bflad reviewed Feb 25, 2018

View reviewed changes

bflad added the waiting-response Maintainers are waiting on response from community or contributor. label Feb 25, 2018

Syntax updates for PR review

652531c

ghost added the size/L Managed by automation to categorize the size of a PR. label Feb 26, 2018

Adds acceptance tests for EB environment ARN and tags

6c194ca

ctreatma force-pushed the feature/beanstalk_update_tags branch from 25ad96f to 6c194ca Compare February 27, 2018 21:44

ghost added the size/L Managed by automation to categorize the size of a PR. label Feb 27, 2018

bflad removed the waiting-response Maintainers are waiting on response from community or contributor. label Feb 28, 2018

bflad reviewed Feb 28, 2018

View reviewed changes

bflad added the waiting-response Maintainers are waiting on response from community or contributor. label Mar 1, 2018

Adds env check so that acceptance tests pass

5659931

ghost added the size/L Managed by automation to categorize the size of a PR. label Mar 1, 2018

bflad removed the waiting-response Maintainers are waiting on response from community or contributor. label Mar 1, 2018

bflad approved these changes Mar 1, 2018

View reviewed changes

bflad added this to the v1.11.0 milestone Mar 1, 2018

bflad merged commit 4005339 into hashicorp:master Mar 1, 2018

bflad added a commit that referenced this pull request Mar 1, 2018

Update CHANGELOG for #3513

f449761

ewbankkit mentioned this pull request Jan 14, 2020

Request: Elastic Beanstalk Add/Update new or existing tags #3680

Closed

ghost locked and limited conversation to collaborators Apr 7, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Closes #3004: adds support for modifying Beanstalk tags #3513

Closes #3004: adds support for modifying Beanstalk tags #3513

ctreatma commented Feb 24, 2018

bflad left a comment

bflad Feb 25, 2018

bflad Feb 25, 2018

bflad Feb 25, 2018

ctreatma commented Feb 25, 2018

ctreatma commented Feb 28, 2018

bflad Feb 28, 2018

bflad left a comment

bflad commented Mar 9, 2018

ghost commented Apr 7, 2020

Closes #3004: adds support for modifying Beanstalk tags #3513

Closes #3004: adds support for modifying Beanstalk tags #3513

Conversation

ctreatma commented Feb 24, 2018

bflad left a comment

Choose a reason for hiding this comment

bflad Feb 25, 2018

Choose a reason for hiding this comment

bflad Feb 25, 2018

Choose a reason for hiding this comment

bflad Feb 25, 2018

Choose a reason for hiding this comment

ctreatma commented Feb 25, 2018

ctreatma commented Feb 28, 2018

bflad Feb 28, 2018

Choose a reason for hiding this comment

bflad left a comment

Choose a reason for hiding this comment

bflad commented Mar 9, 2018

ghost commented Apr 7, 2020