From e7806b135f92e629f7158ba2e46dc1f7bb76a5ff Mon Sep 17 00:00:00 2001 From: Mike Walker Date: Tue, 8 Aug 2017 11:08:28 -0400 Subject: [PATCH 001/184] Adds domain and domain-iam-role-name parameters to resource aws_db_instance. --- aws/resource_aws_db_instance.go | 37 +++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/aws/resource_aws_db_instance.go b/aws/resource_aws_db_instance.go index 3009d32e083..3fa120370d4 100644 --- a/aws/resource_aws_db_instance.go +++ b/aws/resource_aws_db_instance.go @@ -350,6 +350,18 @@ func resourceAwsDbInstance() *schema.Resource { Computed: true, }, + "domain": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + + "domain_iam_role_name": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "tags": tagsSchema(), }, } @@ -660,6 +672,14 @@ func resourceAwsDbInstanceCreate(d *schema.ResourceData, meta interface{}) error opts.EnableIAMDatabaseAuthentication = aws.Bool(attr.(bool)) } + if attr, ok := d.GetOk("domain"); ok { + opts.Domain = aws.String(attr.(string)) + } + + if attr, ok := d.GetOk("domain_iam_role_name"); ok { + opts.DomainIAMRoleName = aws.String(attr.(string)) + } + log.Printf("[DEBUG] DB Instance create configuration: %#v", opts) var err error err = resource.Retry(5*time.Minute, func() *resource.RetryError { @@ -776,6 +796,11 @@ func resourceAwsDbInstanceRead(d *schema.ResourceData, meta interface{}) error { d.Set("monitoring_role_arn", v.MonitoringRoleArn) } + if v.DomainMemberships != nil { + d.Set("domain", v.DomainMemberships[0].Domain) + d.Set("domain-iam-role-name", v.DomainMemberships[0].IAMRoleName) + } + // list tags for resource // set tags conn := meta.(*AWSClient).rdsconn @@ -1028,6 +1053,18 @@ func resourceAwsDbInstanceUpdate(d *schema.ResourceData, meta interface{}) error requestUpdate = true } + if d.HasChange("domain") && !d.IsNewResource() { + d.SetPartial("domain") + req.Domain = aws.String(d.Get("domain").(string)) + requestUpdate = true + } + + if d.HasChange("domain_iam_role_name") && !d.IsNewResource() { + d.SetPartial("domain_iam_role_name") + req.DomainIAMRoleName = aws.String(d.Get("domain_iam_role_name").(string)) + requestUpdate = true + } + log.Printf("[DEBUG] Send DB Instance Modification request: %t", requestUpdate) if requestUpdate { log.Printf("[DEBUG] DB Instance Modification request: %s", req) From b614fc66d5d2fbf1c502aad0616ae4a18e6b5c00 Mon Sep 17 00:00:00 2001 From: Joshua Spence Date: Wed, 28 Feb 2018 15:24:58 +1100 Subject: [PATCH 002/184] Ignore the VPC configuration for a Lambda function if it is empty I have a `lambda_function` module, which supports both EC2 classic and VPC. The problem I have, however, is that there is no way to specify a null configuration for `vpc_config`. This pull request changes the behavior so that the following Terraform configuration is //ignored//, instead of failing with an error (the current behavior): ``` resource "aws_lambda_function" "test" { # ... vpc_config { security_group_ids = [] subnet_ids = [] } } ``` See also #1187 and #1190. --- aws/resource_aws_lambda_function.go | 26 ++++++++++++++- aws/resource_aws_lambda_function_test.go | 41 ++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 1 deletion(-) diff --git a/aws/resource_aws_lambda_function.go b/aws/resource_aws_lambda_function.go index 6050df8d806..fee37d5e007 100644 --- a/aws/resource_aws_lambda_function.go +++ b/aws/resource_aws_lambda_function.go @@ -139,6 +139,31 @@ func resourceAwsLambdaFunction() *schema.Resource { }, }, }, + + // Suppress diffs if the VPC configuration is empty. + DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool { + if v, ok := d.GetOk("vpc_config"); ok { + configs := v.([]interface{}) + config, ok := configs[0].(map[string]interface{}) + + if !ok { + return true + } + + if config == nil { + return true + } + + securityGroups := config["security_group_ids"].(*schema.Set) + subnets := config["subnet_ids"].(*schema.Set) + + if securityGroups.Len() == 0 && subnets.Len() == 0 { + return true + } + } + + return false + }, }, "arn": { Type: schema.TypeString, @@ -291,7 +316,6 @@ func resourceAwsLambdaFunctionCreate(d *schema.ResourceData, meta interface{}) e } if v, ok := d.GetOk("vpc_config"); ok { - configs := v.([]interface{}) config, ok := configs[0].(map[string]interface{}) diff --git a/aws/resource_aws_lambda_function_test.go b/aws/resource_aws_lambda_function_test.go index 29f2774089c..4013e47516b 100644 --- a/aws/resource_aws_lambda_function_test.go +++ b/aws/resource_aws_lambda_function_test.go @@ -586,6 +586,31 @@ func TestAccAWSLambdaFunction_VPC_withInvocation(t *testing.T) { }) } +func TestAccAWSLambdaFunction_EmptyVpcConfig(t *testing.T) { + var conf lambda.GetFunctionOutput + + rString := acctest.RandString(8) + funcName := fmt.Sprintf("tf_acc_lambda_func_empty_vpc_config_%s", rString) + policyName := fmt.Sprintf("tf_acc_policy_lambda_func_empty_vpc_config_%s", rString) + roleName := fmt.Sprintf("tf_acc_role_lambda_func_empty_vpc_config_%s", rString) + sgName := fmt.Sprintf("tf_acc_sg_lambda_func_empty_vpc_config_%s", rString) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckLambdaFunctionDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSLambdaConfigWithEmptyVpcConfig(funcName, policyName, roleName, sgName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAwsLambdaFunctionExists("aws_lambda_function.test", funcName, &conf), + resource.TestCheckResourceAttr("aws_lambda_function.test", "vpc_config.#", "0"), + ), + }, + }, + }) +} + func TestAccAWSLambdaFunction_s3(t *testing.T) { var conf lambda.GetFunctionOutput @@ -1668,6 +1693,22 @@ resource "aws_security_group" "sg_for_lambda_2" { `, funcName, sgName2) } +func testAccAWSLambdaConfigWithEmptyVpcConfig(funcName, policyName, roleName, sgName string) string { + return fmt.Sprintf(baseAccAWSLambdaConfig(policyName, roleName, sgName)+` +resource "aws_lambda_function" "test" { + filename = "test-fixtures/lambdatest.zip" + function_name = "%s" + role = "${aws_iam_role.iam_for_lambda.arn}" + handler = "exports.example" + runtime = "nodejs4.3" + + vpc_config { + subnet_ids = [] + security_group_ids = [] + } +}`, funcName) +} + func testAccAWSLambdaConfigS3(bucketName, roleName, funcName string) string { return fmt.Sprintf(` resource "aws_s3_bucket" "lambda_bucket" { From 9a2b871ce9adaff3a90018c25a7a39461941da27 Mon Sep 17 00:00:00 2001 From: Matthew Burtless Date: Sat, 11 Aug 2018 14:24:18 -0400 Subject: [PATCH 003/184] Removes Computed attributes from domain and domain_iam_role_name, adds further checking to DomainMemberships --- aws/resource_aws_db_instance.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/aws/resource_aws_db_instance.go b/aws/resource_aws_db_instance.go index 4ce207ee0bc..8e626ebefa1 100644 --- a/aws/resource_aws_db_instance.go +++ b/aws/resource_aws_db_instance.go @@ -407,13 +407,11 @@ func resourceAwsDbInstance() *schema.Resource { "domain": { Type: schema.TypeString, Optional: true, - Computed: true, }, "domain_iam_role_name": { Type: schema.TypeString, Optional: true, - Computed: true, }, "tags": tagsSchema(), @@ -1032,7 +1030,7 @@ func resourceAwsDbInstanceRead(d *schema.ResourceData, meta interface{}) error { return fmt.Errorf("error setting enabled_cloudwatch_logs_exports: %s", err) } - if v.DomainMemberships != nil { + if len(v.DomainMemberships) > 0 && v.DomainMemberships[0] != nil { d.Set("domain", v.DomainMemberships[0].Domain) d.Set("domain_iam_role_name", v.DomainMemberships[0].IAMRoleName) } From 6d7c4f5dce19827c23bfe92c5bef043e427910ed Mon Sep 17 00:00:00 2001 From: Matthew Burtless Date: Sat, 11 Aug 2018 14:42:41 -0400 Subject: [PATCH 004/184] Updated name of config for domain acceptance test to match standard --- aws/resource_aws_db_instance_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/aws/resource_aws_db_instance_test.go b/aws/resource_aws_db_instance_test.go index cf309d9c7e8..05c35e01ac6 100644 --- a/aws/resource_aws_db_instance_test.go +++ b/aws/resource_aws_db_instance_test.go @@ -469,7 +469,7 @@ func TestAccAWSDBInstance_MSSQL_Domain(t *testing.T) { CheckDestroy: testAccCheckAWSDBInstanceDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSDBMSSQL_domain(rInt), + Config: testAccAWSDBMSSQLDomain(rInt), Check: resource.ComposeTestCheckFunc( testAccCheckAWSDBInstanceExists("aws_db_instance.mssql", &v), resource.TestCheckResourceAttrSet( @@ -1660,7 +1660,7 @@ resource "aws_security_group_rule" "rds-mssql-1" { `, rInt, rInt, rInt) } -func testAccAWSDBMSSQL_domain(rInt int) string { +func testAccAWSDBMSSQLDomain(rInt int) string { return fmt.Sprintf(` resource "aws_vpc" "foo" { cidr_block = "10.1.0.0/16" From 24ab317ef6425688e4db9ab2015cf5c6471bcbe0 Mon Sep 17 00:00:00 2001 From: Matthew Burtless Date: Sun, 19 Aug 2018 22:57:00 -0400 Subject: [PATCH 005/184] Minor bug fixes and adds acceptance test step to ensure updating domain of db instance works as expected. This commit integrates suggesting made by @bflad in review. It also merges any updates to domain or domain_iam_role_name into a single update request, as both arguments must be present in order to update either property of a DB instance. Finally, it adds an accpetance test step to ensure that after a db instance is joined to a domain, it can be succesfully moved to another by updating the domain argument.X --- aws/resource_aws_db_instance.go | 8 +- aws/resource_aws_db_instance_test.go | 192 +++++++++++++++++++++++++-- 2 files changed, 186 insertions(+), 14 deletions(-) diff --git a/aws/resource_aws_db_instance.go b/aws/resource_aws_db_instance.go index 8e626ebefa1..c4caf66a5bb 100644 --- a/aws/resource_aws_db_instance.go +++ b/aws/resource_aws_db_instance.go @@ -1285,14 +1285,10 @@ func resourceAwsDbInstanceUpdate(d *schema.ResourceData, meta interface{}) error requestUpdate = true } - if d.HasChange("domain") && !d.IsNewResource() { + if (d.HasChange("domain") || d.HasChange("domain_iam_role_name")) && !d.IsNewResource() { d.SetPartial("domain") - req.Domain = aws.String(d.Get("domain").(string)) - requestUpdate = true - } - - if d.HasChange("domain_iam_role_name") && !d.IsNewResource() { d.SetPartial("domain_iam_role_name") + req.Domain = aws.String(d.Get("domain").(string)) req.DomainIAMRoleName = aws.String(d.Get("domain_iam_role_name").(string)) requestUpdate = true } diff --git a/aws/resource_aws_db_instance_test.go b/aws/resource_aws_db_instance_test.go index 05c35e01ac6..d7a9d4fa0ba 100644 --- a/aws/resource_aws_db_instance_test.go +++ b/aws/resource_aws_db_instance_test.go @@ -472,14 +472,22 @@ func TestAccAWSDBInstance_MSSQL_Domain(t *testing.T) { Config: testAccAWSDBMSSQLDomain(rInt), Check: resource.ComposeTestCheckFunc( testAccCheckAWSDBInstanceExists("aws_db_instance.mssql", &v), + testAccCheckAWSDBInstanceDomainAttributes("foo.somedomain.com", &v), + resource.TestCheckResourceAttrSet( + "aws_db_instance.mssql", "domain"), + resource.TestCheckResourceAttrSet( + "aws_db_instance.mssql", "domain_iam_role_name"), + ), + }, + { + Config: testAccAWSDBMSSQLUpdateDomain(rInt), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSDBInstanceExists("aws_db_instance.mssql", &v), + testAccCheckAWSDBInstanceDomainAttributes("bar.somedomain.com", &v), resource.TestCheckResourceAttrSet( "aws_db_instance.mssql", "domain"), resource.TestCheckResourceAttrSet( "aws_db_instance.mssql", "domain_iam_role_name"), - resource.TestCheckResourceAttr( - "aws_db_instance.mssql", "allocated_storage", "20"), - resource.TestCheckResourceAttr( - "aws_db_instance.mssql", "engine", "sqlserver-ex"), ), }, }, @@ -700,6 +708,39 @@ func testAccCheckAWSDBInstanceAttributes_MSSQL(v *rds.DBInstance, tz string) res } } +func testAccCheckAWSDBInstanceDomainAttributes(domain string, v *rds.DBInstance) resource.TestCheckFunc { + return func(s *terraform.State) error { + // Grab domainmemberships list and compare domain to FQDN + for _, dm := range v.DomainMemberships { + if *dm.FQDN != domain { + continue + } + + return nil + } + + return fmt.Errorf("Domain %s not found in domain memberships", domain) + /*dsconn := testAccProvider.Meta().(*AWSClient).dsconn + out, err := dsconn.DescribeDirectories(&directoryservice.DescribeDirectoriesInput{ + DirectoryIds: []*string{aws.String(*v.Domain)}, + }) + + if err != nil { + return err + } + + if len(out.DirectoryDescriptions) < 1 { + return fmt.Errorf("DS directory %s not found", *v.Domain) + } + + if *out.DirectoryDescriptions[0].Name != domain { + return fmt.Errorf("DS directory name mismatch, expected: '%s', got: '%s'", domain, *out.DirectoryDescriptions[0].Name) + }*/ + + return nil + } +} + func testAccCheckAWSDBInstanceReplicaAttributes(source, replica *rds.DBInstance) resource.TestCheckFunc { return func(s *terraform.State) error { @@ -1708,7 +1749,130 @@ resource "aws_db_instance" "mssql" { backup_retention_period = 0 skip_final_snapshot = true - domain = "${aws_directory_service_directory.directory.id}" + domain = "${aws_directory_service_directory.foo.id}" + domain_iam_role_name = "${aws_iam_role.role.name}" + + vpc_security_group_ids = ["${aws_security_group.rds-mssql.id}"] +} + +resource "aws_security_group" "rds-mssql" { + name = "tf-rds-mssql-test-%d" + + description = "TF Testing" + vpc_id = "${aws_vpc.foo.id}" +} + +resource "aws_security_group_rule" "rds-mssql-1" { + type = "egress" + from_port = 0 + to_port = 0 + protocol = "-1" + cidr_blocks = ["0.0.0.0/0"] + + security_group_id = "${aws_security_group.rds-mssql.id}" +} + +resource "aws_directory_service_directory" "foo" { + name = "foo.somedomain.com" + password = "SuperSecretPassw0rd" + type = "MicrosoftAD" + edition = "Standard" + + vpc_settings { + vpc_id = "${aws_vpc.foo.id}" + subnet_ids = ["${aws_subnet.main.id}", "${aws_subnet.other.id}"] + } +} + +resource "aws_directory_service_directory" "bar" { + name = "bar.somedomain.com" + password = "SuperSecretPassw0rd" + type = "MicrosoftAD" + edition = "Standard" + + vpc_settings { + vpc_id = "${aws_vpc.foo.id}" + subnet_ids = ["${aws_subnet.main.id}", "${aws_subnet.other.id}"] + } +} + +resource "aws_iam_role" "role" { + name = "tf-acc-db-instance-mssql-domain-role" + + assume_role_policy = < Date: Sun, 19 Aug 2018 23:25:39 -0400 Subject: [PATCH 006/184] Removed commented test code --- aws/resource_aws_db_instance_test.go | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/aws/resource_aws_db_instance_test.go b/aws/resource_aws_db_instance_test.go index b8b2bf802db..a141e8d9d5a 100644 --- a/aws/resource_aws_db_instance_test.go +++ b/aws/resource_aws_db_instance_test.go @@ -822,7 +822,6 @@ func testAccCheckAWSDBInstanceAttributes_MSSQL(v *rds.DBInstance, tz string) res func testAccCheckAWSDBInstanceDomainAttributes(domain string, v *rds.DBInstance) resource.TestCheckFunc { return func(s *terraform.State) error { - // Grab domainmemberships list and compare domain to FQDN for _, dm := range v.DomainMemberships { if *dm.FQDN != domain { continue @@ -832,24 +831,6 @@ func testAccCheckAWSDBInstanceDomainAttributes(domain string, v *rds.DBInstance) } return fmt.Errorf("Domain %s not found in domain memberships", domain) - /*dsconn := testAccProvider.Meta().(*AWSClient).dsconn - out, err := dsconn.DescribeDirectories(&directoryservice.DescribeDirectoriesInput{ - DirectoryIds: []*string{aws.String(*v.Domain)}, - }) - - if err != nil { - return err - } - - if len(out.DirectoryDescriptions) < 1 { - return fmt.Errorf("DS directory %s not found", *v.Domain) - } - - if *out.DirectoryDescriptions[0].Name != domain { - return fmt.Errorf("DS directory name mismatch, expected: '%s', got: '%s'", domain, *out.DirectoryDescriptions[0].Name) - }*/ - - return nil } } From 95cdc948f80095ae6036d9b4ccc4f2766065f2e4 Mon Sep 17 00:00:00 2001 From: Bastiaan Schaap Date: Tue, 21 Aug 2018 16:09:05 +0200 Subject: [PATCH 007/184] Make ebs_optimized default False --- aws/resource_aws_launch_template.go | 3 ++- aws/resource_aws_launch_template_test.go | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/aws/resource_aws_launch_template.go b/aws/resource_aws_launch_template.go index c599182c3c1..e1563366eaa 100644 --- a/aws/resource_aws_launch_template.go +++ b/aws/resource_aws_launch_template.go @@ -149,6 +149,7 @@ func resourceAwsLaunchTemplate() *schema.Resource { "ebs_optimized": { Type: schema.TypeBool, Optional: true, + Default: false, }, "elastic_gpu_specifications": { @@ -840,7 +841,7 @@ func buildLaunchTemplateData(d *schema.ResourceData, meta interface{}) (*ec2.Req opts.DisableApiTermination = aws.Bool(v.(bool)) } - if v, ok := d.GetOk("ebs_optimized"); ok { + if v, ok := d.GetOkExists("ebs_optimized"); ok { opts.EbsOptimized = aws.Bool(v.(bool)) } diff --git a/aws/resource_aws_launch_template_test.go b/aws/resource_aws_launch_template_test.go index 151b7011ef7..aa7c70e3fed 100644 --- a/aws/resource_aws_launch_template_test.go +++ b/aws/resource_aws_launch_template_test.go @@ -81,6 +81,7 @@ func TestAccAWSLaunchTemplate_data(t *testing.T) { resource.TestCheckResourceAttr(resName, "block_device_mappings.#", "1"), resource.TestCheckResourceAttr(resName, "credit_specification.#", "1"), resource.TestCheckResourceAttrSet(resName, "disable_api_termination"), + resource.TestCheckResourceAttrSet(resName, "ebs_optimized"), resource.TestCheckResourceAttr(resName, "elastic_gpu_specifications.#", "1"), resource.TestCheckResourceAttr(resName, "iam_instance_profile.#", "1"), resource.TestCheckResourceAttrSet(resName, "image_id"), From 6f641fbeba52bc66a15623b99f335d6088ceb1f3 Mon Sep 17 00:00:00 2001 From: Bastiaan Schaap Date: Tue, 21 Aug 2018 23:36:15 +0200 Subject: [PATCH 008/184] Refactor ebs_optimized to schema.TypeString --- aws/resource_aws_launch_template.go | 21 ++++++++++++++++----- aws/resource_aws_launch_template_test.go | 2 +- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/aws/resource_aws_launch_template.go b/aws/resource_aws_launch_template.go index e1563366eaa..e98e52eda09 100644 --- a/aws/resource_aws_launch_template.go +++ b/aws/resource_aws_launch_template.go @@ -147,9 +147,13 @@ func resourceAwsLaunchTemplate() *schema.Resource { }, "ebs_optimized": { - Type: schema.TypeBool, + Type: schema.TypeString, Optional: true, - Default: false, + ValidateFunc: validation.StringInSlice([]string{ + "", + "false", + "true", + }, false), }, "elastic_gpu_specifications": { @@ -527,7 +531,6 @@ func resourceAwsLaunchTemplateRead(d *schema.ResourceData, meta interface{}) err ltData := dltv.LaunchTemplateVersions[0].LaunchTemplateData d.Set("disable_api_termination", ltData.DisableApiTermination) - d.Set("ebs_optimized", ltData.EbsOptimized) d.Set("image_id", ltData.ImageId) d.Set("instance_initiated_shutdown_behavior", ltData.InstanceInitiatedShutdownBehavior) d.Set("instance_type", ltData.InstanceType) @@ -538,6 +541,10 @@ func resourceAwsLaunchTemplateRead(d *schema.ResourceData, meta interface{}) err d.Set("user_data", ltData.UserData) d.Set("vpc_security_group_ids", aws.StringValueSlice(ltData.SecurityGroupIds)) + if ltData.EbsOptimized != nil { + d.Set("ebs_optimized", strconv.FormatBool(aws.BoolValue(ltData.EbsOptimized))) + } + if err := d.Set("block_device_mappings", getBlockDeviceMappings(ltData.BlockDeviceMappings)); err != nil { return err } @@ -841,8 +848,12 @@ func buildLaunchTemplateData(d *schema.ResourceData, meta interface{}) (*ec2.Req opts.DisableApiTermination = aws.Bool(v.(bool)) } - if v, ok := d.GetOkExists("ebs_optimized"); ok { - opts.EbsOptimized = aws.Bool(v.(bool)) + if v, ok := d.GetOk("ebs_optimized"); ok && v.(string) != "" { + vBool, err := strconv.ParseBool(v.(string)) + if err != nil { + return nil, fmt.Errorf("error converting ebs_optimized %q from string to boolean: %s", v.(string), err) + } + opts.EbsOptimized = aws.Bool(vBool) } if v, ok := d.GetOk("security_group_names"); ok { diff --git a/aws/resource_aws_launch_template_test.go b/aws/resource_aws_launch_template_test.go index aa7c70e3fed..ca6e8cbdcc0 100644 --- a/aws/resource_aws_launch_template_test.go +++ b/aws/resource_aws_launch_template_test.go @@ -324,7 +324,7 @@ resource "aws_launch_template" "foo" { disable_api_termination = true - ebs_optimized = true + ebs_optimized = false elastic_gpu_specifications { type = "test" From c1c2993f6ac4c6279534868d3f109cfb33db9341 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 22 Aug 2018 07:58:06 -0400 Subject: [PATCH 009/184] provider: Add gometalinter to Make targets and enable errcheck, interfacer, and structcheck linting for TravisCI Keeps backwards compatibility with existing Make targets. We can enable other linters in the future, but they currently are not passing. --- .gometalinter.json | 20 ++++++++++++++++++++ .travis.yml | 4 ++-- GNUmakefile | 32 ++++++++++++++++++-------------- scripts/errcheck.sh | 24 ------------------------ scripts/gofmtcheck.sh | 13 ------------- 5 files changed, 40 insertions(+), 53 deletions(-) create mode 100644 .gometalinter.json delete mode 100755 scripts/errcheck.sh delete mode 100755 scripts/gofmtcheck.sh diff --git a/.gometalinter.json b/.gometalinter.json new file mode 100644 index 00000000000..ccfa1fe178a --- /dev/null +++ b/.gometalinter.json @@ -0,0 +1,20 @@ +{ + "Deadline": "5m", + "Enable": [ + "errcheck", + "gofmt", + "interfacer", + "structcheck", + "vet" + ], + "EnableGC": true, + "Linters": { + "errcheck": { + "Command": "errcheck -abspath {not_tests=-ignoretests} -ignore github.com/hashicorp/terraform/helper/schema:ForceNew|Set -ignore io:Close" + } + }, + "Sort": [ + "path", + "line" + ] +} \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 3cc3dd74cf8..b850b77929b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,12 +15,12 @@ install: # packages that live there. # See: https://github.com/golang/go/issues/12933 - bash scripts/gogetcookie.sh -- go get github.com/kardianos/govendor +- make tools script: +- make lint - make test - make vendor-status -- make vet - make website-test branches: diff --git a/GNUmakefile b/GNUmakefile index 4f24da37245..37b7f0f126a 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -19,23 +19,23 @@ test: fmtcheck testacc: fmtcheck TF_ACC=1 go test $(TEST) -v $(TESTARGS) -timeout 120m -vet: - @echo "go vet ." - @go vet $$(go list ./... | grep -v vendor/) ; if [ $$? -eq 1 ]; then \ - echo ""; \ - echo "Vet found suspicious constructs. Please check the reported constructs"; \ - echo "and fix them if necessary before submitting the code for review."; \ - exit 1; \ - fi - fmt: - gofmt -w $(GOFMT_FILES) + @echo "==> Fixing source code with gofmt..." + gofmt -s -w ./$(PKG_NAME) +# Currently required by tf-deploy compile fmtcheck: - @sh -c "'$(CURDIR)/scripts/gofmtcheck.sh'" + @echo "==> Checking source code against gofmt..." + @gofmt -l -s ./$(PKG_NAME) -errcheck: - @sh -c "'$(CURDIR)/scripts/errcheck.sh'" +lint: + @echo "==> Checking source code against linters..." + @gometalinter ./$(PKG_NAME) + +tools: + go get -u github.com/kardianos/govendor + go get -u github.com/alecthomas/gometalinter + gometalinter --install vendor-status: @govendor status @@ -55,6 +55,10 @@ ifeq (,$(wildcard $(GOPATH)/src/$(WEBSITE_REPO))) endif @$(MAKE) -C $(GOPATH)/src/$(WEBSITE_REPO) website-provider PROVIDER_PATH=$(shell pwd) PROVIDER_NAME=$(PKG_NAME) +website-lint: + @echo "==> Checking website against linters..." + @misspell -error -source=text website/ + website-test: ifeq (,$(wildcard $(GOPATH)/src/$(WEBSITE_REPO))) echo "$(WEBSITE_REPO) not found in your GOPATH (necessary for layouts and assets), get-ting..." @@ -62,5 +66,5 @@ ifeq (,$(wildcard $(GOPATH)/src/$(WEBSITE_REPO))) endif @$(MAKE) -C $(GOPATH)/src/$(WEBSITE_REPO) website-provider-test PROVIDER_PATH=$(shell pwd) PROVIDER_NAME=$(PKG_NAME) -.PHONY: build sweep test testacc vet fmt fmtcheck errcheck vendor-status test-compile website website-test +.PHONY: build sweep test testacc fmt fmtcheck lint tools vendor-status test-compile website website-lint website-test diff --git a/scripts/errcheck.sh b/scripts/errcheck.sh deleted file mode 100755 index 15464f5aa37..00000000000 --- a/scripts/errcheck.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -# Check gofmt -echo "==> Checking for unchecked errors..." - -if ! which errcheck > /dev/null; then - echo "==> Installing errcheck..." - go get -u github.com/kisielk/errcheck -fi - -err_files=$(errcheck -ignoretests \ - -ignore 'github.com/hashicorp/terraform/helper/schema:Set' \ - -ignore 'bytes:.*' \ - -ignore 'io:Close|Write' \ - $(go list ./...| grep -v /vendor/)) - -if [[ -n ${err_files} ]]; then - echo 'Unchecked errors found in the following places:' - echo "${err_files}" - echo "Please handle returned errors. You can check directly with \`make errcheck\`" - exit 1 -fi - -exit 0 diff --git a/scripts/gofmtcheck.sh b/scripts/gofmtcheck.sh deleted file mode 100755 index 980265c2e97..00000000000 --- a/scripts/gofmtcheck.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash - -# Check gofmt -echo "==> Checking that code complies with gofmt requirements..." -gofmt_files=$(find . -name '*.go' | grep -v vendor | xargs gofmt -l) -if [[ -n ${gofmt_files} ]]; then - echo 'gofmt needs running on the following files:' - echo "${gofmt_files}" - echo "You can use the command: \`make fmt\` to reformat code." - exit 1 -fi - -exit 0 From 90dd10a9422796e1397b932f92fd4c5049e2be02 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 22 Aug 2018 16:06:41 -0400 Subject: [PATCH 010/184] provider: Reinstate scripts/gofmtcheck.sh, add Vendor/WarnUnmatchedDirective to .gometalinter.json --- .gometalinter.json | 4 +++- GNUmakefile | 3 +-- scripts/gofmtcheck.sh | 13 +++++++++++++ 3 files changed, 17 insertions(+), 3 deletions(-) create mode 100755 scripts/gofmtcheck.sh diff --git a/.gometalinter.json b/.gometalinter.json index ccfa1fe178a..b7916fd9fb4 100644 --- a/.gometalinter.json +++ b/.gometalinter.json @@ -16,5 +16,7 @@ "Sort": [ "path", "line" - ] + ], + "Vendor": true, + "WarnUnmatchedDirective": true } \ No newline at end of file diff --git a/GNUmakefile b/GNUmakefile index 37b7f0f126a..eec5686780d 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -25,8 +25,7 @@ fmt: # Currently required by tf-deploy compile fmtcheck: - @echo "==> Checking source code against gofmt..." - @gofmt -l -s ./$(PKG_NAME) + @sh -c "'$(CURDIR)/scripts/gofmtcheck.sh'" lint: @echo "==> Checking source code against linters..." diff --git a/scripts/gofmtcheck.sh b/scripts/gofmtcheck.sh new file mode 100755 index 00000000000..dd2307acc57 --- /dev/null +++ b/scripts/gofmtcheck.sh @@ -0,0 +1,13 @@ +#!/usr/bin/env bash + +# Check gofmt +echo "==> Checking that code complies with gofmt requirements..." +gofmt_files=$(find . -name '*.go' | grep -v vendor | xargs gofmt -l -s) +if [[ -n ${gofmt_files} ]]; then + echo 'gofmt needs running on the following files:' + echo "${gofmt_files}" + echo "You can use the command: \`make fmt\` to reformat code." + exit 1 +fi + +exit 0 From 2c21f1548536542aed8d70e3b507ec62e827057f Mon Sep 17 00:00:00 2001 From: parabolic Date: Sun, 26 Aug 2018 12:22:08 +0200 Subject: [PATCH 011/184] add the include_body option to the resouce and set it to false as default as it is with the api --- aws/resource_aws_cloudfront_distribution.go | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/aws/resource_aws_cloudfront_distribution.go b/aws/resource_aws_cloudfront_distribution.go index 640fe06ba3c..bf72d8055d1 100644 --- a/aws/resource_aws_cloudfront_distribution.go +++ b/aws/resource_aws_cloudfront_distribution.go @@ -124,6 +124,11 @@ func resourceAwsCloudFrontDistribution() *schema.Resource { Type: schema.TypeString, Required: true, }, + "include_body": { + Type: schema.TypeBool, + Optional: true, + Default: false, + }, }, }, Set: lambdaFunctionAssociationHash, @@ -249,6 +254,11 @@ func resourceAwsCloudFrontDistribution() *schema.Resource { Type: schema.TypeString, Required: true, }, + "include_body": { + Type: schema.TypeBool, + Optional: true, + Default: false, + }, }, }, Set: lambdaFunctionAssociationHash, @@ -404,6 +414,11 @@ func resourceAwsCloudFrontDistribution() *schema.Resource { Type: schema.TypeString, Required: true, }, + "include_body": { + Type: schema.TypeBool, + Optional: true, + Default: false, + }, }, }, Set: lambdaFunctionAssociationHash, From 6bbf7f904cfd3a45febe43031f9dcfa26504787d Mon Sep 17 00:00:00 2001 From: parabolic Date: Sun, 26 Aug 2018 12:22:53 +0200 Subject: [PATCH 012/184] add the option to the configuration structure --- aws/cloudfront_distribution_configuration_structure.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/aws/cloudfront_distribution_configuration_structure.go b/aws/cloudfront_distribution_configuration_structure.go index 55bdd3509d5..013f5508ff3 100644 --- a/aws/cloudfront_distribution_configuration_structure.go +++ b/aws/cloudfront_distribution_configuration_structure.go @@ -526,6 +526,7 @@ func lambdaFunctionAssociationHash(v interface{}) int { m := v.(map[string]interface{}) buf.WriteString(fmt.Sprintf("%s-", m["event_type"].(string))) buf.WriteString(fmt.Sprintf("%s", m["lambda_arn"].(string))) + buf.WriteString(fmt.Sprintf("%t", m["include_body"].(bool))) return hashcode.String(buf.String()) } @@ -554,6 +555,9 @@ func expandLambdaFunctionAssociation(lf map[string]interface{}) *cloudfront.Lamb if v, ok := lf["lambda_arn"]; ok { lfa.LambdaFunctionARN = aws.String(v.(string)) } + if v, ok := lf["include_body"]; ok { + lfa.IncludeBody = aws.Bool(v.(bool)) + } return &lfa } @@ -570,6 +574,7 @@ func flattenLambdaFunctionAssociation(lfa *cloudfront.LambdaFunctionAssociation) if lfa != nil { m["event_type"] = *lfa.EventType m["lambda_arn"] = *lfa.LambdaFunctionARN + m["include_body"] = *lfa.IncludeBody } return m } From 650f79bc6f28c2cc27cf5a4eb0298cc0bceca57a Mon Sep 17 00:00:00 2001 From: parabolic Date: Sun, 26 Aug 2018 12:23:00 +0200 Subject: [PATCH 013/184] adjust the tests for the include_body option --- ...dfront_distribution_configuration_structure_test.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/aws/cloudfront_distribution_configuration_structure_test.go b/aws/cloudfront_distribution_configuration_structure_test.go index 12ed2b1b075..8919e376a94 100644 --- a/aws/cloudfront_distribution_configuration_structure_test.go +++ b/aws/cloudfront_distribution_configuration_structure_test.go @@ -50,12 +50,14 @@ func trustedSignersConf() []interface{} { func lambdaFunctionAssociationsConf() *schema.Set { x := []interface{}{ map[string]interface{}{ - "event_type": "viewer-request", - "lambda_arn": "arn:aws:lambda:us-east-1:999999999:function1:alias", + "event_type": "viewer-request", + "lambda_arn": "arn:aws:lambda:us-east-1:999999999:function1:alias", + "include_body": true, }, map[string]interface{}{ - "event_type": "origin-response", - "lambda_arn": "arn:aws:lambda:us-east-1:999999999:function2:alias", + "event_type": "origin-response", + "lambda_arn": "arn:aws:lambda:us-east-1:999999999:function2:alias", + "include_body": true, }, } From 5e2da4a16bc1bca54bde887bf786122a24eedd2a Mon Sep 17 00:00:00 2001 From: Matthew Burtless Date: Tue, 21 Aug 2018 21:27:03 -0400 Subject: [PATCH 014/184] Adds support for domain and domain_iam_role_name to RestoreDBInstanceFromDBSnapshotInput --- aws/resource_aws_db_instance.go | 8 ++ aws/resource_aws_db_instance_test.go | 171 ++++++++++++++++++++++++++- 2 files changed, 174 insertions(+), 5 deletions(-) diff --git a/aws/resource_aws_db_instance.go b/aws/resource_aws_db_instance.go index e32dbc5c276..2ac0b7e0b7b 100644 --- a/aws/resource_aws_db_instance.go +++ b/aws/resource_aws_db_instance.go @@ -704,6 +704,14 @@ func resourceAwsDbInstanceCreate(d *schema.ResourceData, meta interface{}) error opts.DBSubnetGroupName = aws.String(attr.(string)) } + if attr, ok := d.GetOk("domain"); ok { + opts.Domain = aws.String(attr.(string)) + } + + if attr, ok := d.GetOk("domain_iam_role_name"); ok { + opts.DomainIAMRoleName = aws.String(attr.(string)) + } + if attr, ok := d.GetOk("enabled_cloudwatch_logs_exports"); ok && len(attr.([]interface{})) > 0 { opts.EnableCloudwatchLogsExports = expandStringList(attr.([]interface{})) } diff --git a/aws/resource_aws_db_instance_test.go b/aws/resource_aws_db_instance_test.go index e41cc9c9b8c..14b4a578321 100644 --- a/aws/resource_aws_db_instance_test.go +++ b/aws/resource_aws_db_instance_test.go @@ -572,7 +572,7 @@ func TestAccAWSDBInstance_MSSQL_TZ(t *testing.T) { } func TestAccAWSDBInstance_MSSQL_Domain(t *testing.T) { - var v rds.DBInstance + var vBefore, vAfter rds.DBInstance rInt := acctest.RandInt() resource.Test(t, resource.TestCase{ @@ -583,8 +583,8 @@ func TestAccAWSDBInstance_MSSQL_Domain(t *testing.T) { { Config: testAccAWSDBMSSQLDomain(rInt), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSDBInstanceExists("aws_db_instance.mssql", &v), - testAccCheckAWSDBInstanceDomainAttributes("foo.somedomain.com", &v), + testAccCheckAWSDBInstanceExists("aws_db_instance.mssql", &vBefore), + testAccCheckAWSDBInstanceDomainAttributes("foo.somedomain.com", &vBefore), resource.TestCheckResourceAttrSet( "aws_db_instance.mssql", "domain"), resource.TestCheckResourceAttrSet( @@ -594,8 +594,8 @@ func TestAccAWSDBInstance_MSSQL_Domain(t *testing.T) { { Config: testAccAWSDBMSSQLUpdateDomain(rInt), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSDBInstanceExists("aws_db_instance.mssql", &v), - testAccCheckAWSDBInstanceDomainAttributes("bar.somedomain.com", &v), + testAccCheckAWSDBInstanceExists("aws_db_instance.mssql", &vAfter), + testAccCheckAWSDBInstanceDomainAttributes("bar.somedomain.com", &vAfter), resource.TestCheckResourceAttrSet( "aws_db_instance.mssql", "domain"), resource.TestCheckResourceAttrSet( @@ -606,6 +606,31 @@ func TestAccAWSDBInstance_MSSQL_Domain(t *testing.T) { }) } +func TestAccAWSDBInstance_MSSQL_DomainSnapshotRestore(t *testing.T) { + var v, vRestoredInstance rds.DBInstance + rInt := acctest.RandInt() + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSDBInstanceDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSDBMSSQLDomainSnapshotRestore(rInt), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSDBInstanceExists("aws_db_instance.mssql_restore", &vRestoredInstance), + testAccCheckAWSDBInstanceExists("aws_db_instance.mssql", &v), + testAccCheckAWSDBInstanceDomainAttributes("foo.somedomain.com", &vRestoredInstance), + resource.TestCheckResourceAttrSet( + "aws_db_instance.mssql_restore", "domain"), + resource.TestCheckResourceAttrSet( + "aws_db_instance.mssql_restore", "domain_iam_role_name"), + ), + }, + }, + }) +} + func TestAccAWSDBInstance_MinorVersion(t *testing.T) { var v rds.DBInstance @@ -2067,6 +2092,142 @@ resource "aws_iam_role_policy_attachment" "attatch-policy" { `, rInt, rInt, rInt) } +func testAccAWSDBMSSQLDomainSnapshotRestore(rInt int) string { + return fmt.Sprintf(` +resource "aws_vpc" "foo" { + cidr_block = "10.1.0.0/16" + enable_dns_hostnames = true + tags { + Name = "terraform-testacc-db-instance-mssql-domain" + } +} + +resource "aws_db_subnet_group" "rds_one" { + name = "tf_acc_test_%d" + description = "db subnets for rds_one" + + subnet_ids = ["${aws_subnet.main.id}", "${aws_subnet.other.id}"] +} + +resource "aws_subnet" "main" { + vpc_id = "${aws_vpc.foo.id}" + availability_zone = "us-west-2a" + cidr_block = "10.1.1.0/24" + tags { + Name = "tf-acc-db-instance-mssql-domain-main" + } +} + +resource "aws_subnet" "other" { + vpc_id = "${aws_vpc.foo.id}" + availability_zone = "us-west-2b" + cidr_block = "10.1.2.0/24" + tags { + Name = "tf-acc-db-instance-mssql-domain-other" + } +} + +resource "aws_db_instance" "mssql" { + identifier = "tf-test-mssql-%d" + + db_subnet_group_name = "${aws_db_subnet_group.rds_one.name}" + + instance_class = "db.t2.micro" + allocated_storage = 20 + username = "somecrazyusername" + password = "somecrazypassword" + engine = "sqlserver-ex" + backup_retention_period = 0 + skip_final_snapshot = true + + domain = "${aws_directory_service_directory.foo.id}" + domain_iam_role_name = "${aws_iam_role.role.name}" + + vpc_security_group_ids = ["${aws_security_group.rds-mssql.id}"] +} + +resource "aws_db_snapshot" "mssql-snap" { + db_instance_identifier = "${aws_db_instance.mssql.id}" + db_snapshot_identifier = "mssql-snap" +} + +resource "aws_db_instance" "mssql_restore" { + identifier = "tf-test-mssql-%d-restore" + + db_subnet_group_name = "${aws_db_subnet_group.rds_one.name}" + + instance_class = "db.t2.micro" + allocated_storage = 20 + username = "somecrazyusername" + password = "somecrazypassword" + engine = "sqlserver-ex" + backup_retention_period = 0 + skip_final_snapshot = true + snapshot_identifier = "${aws_db_snapshot.mssql-snap.id}" + + domain = "${aws_directory_service_directory.foo.id}" + domain_iam_role_name = "${aws_iam_role.role.name}" + + apply_immediately = true + vpc_security_group_ids = ["${aws_security_group.rds-mssql.id}"] +} + +resource "aws_security_group" "rds-mssql" { + name = "tf-rds-mssql-test-%d" + + description = "TF Testing" + vpc_id = "${aws_vpc.foo.id}" +} + +resource "aws_security_group_rule" "rds-mssql-1" { + type = "egress" + from_port = 0 + to_port = 0 + protocol = "-1" + cidr_blocks = ["0.0.0.0/0"] + + security_group_id = "${aws_security_group.rds-mssql.id}" +} + +resource "aws_directory_service_directory" "foo" { + name = "foo.somedomain.com" + password = "SuperSecretPassw0rd" + type = "MicrosoftAD" + edition = "Standard" + + vpc_settings { + vpc_id = "${aws_vpc.foo.id}" + subnet_ids = ["${aws_subnet.main.id}", "${aws_subnet.other.id}"] + } +} + +resource "aws_iam_role" "role" { + name = "tf-acc-db-instance-mssql-domain-role" + + assume_role_policy = < Date: Mon, 27 Aug 2018 10:46:29 +0200 Subject: [PATCH 015/184] add documentation for the include_body option --- website/docs/r/cloudfront_distribution.html.markdown | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/website/docs/r/cloudfront_distribution.html.markdown b/website/docs/r/cloudfront_distribution.html.markdown index cb42a143fac..2d658d0ae15 100644 --- a/website/docs/r/cloudfront_distribution.html.markdown +++ b/website/docs/r/cloudfront_distribution.html.markdown @@ -294,8 +294,9 @@ resource "aws_cloudfront_distribution" "example" { # ... other configuration ... lambda_function_association { - event_type = "viewer-request" - lambda_arn = "${aws_lambda_function.example.qualified_arn}" + event_type = "viewer-request" + lambda_arn = "${aws_lambda_function.example.qualified_arn}" + include_body = false } } } @@ -305,6 +306,7 @@ resource "aws_cloudfront_distribution" "example" { Valid values: `viewer-request`, `origin-request`, `viewer-response`, `origin-response` * `lambda_arn` (Required) - ARN of the Lambda function. +* `include_body` (Optional) - When set to true it exposes the request body to the lambda function. Defaults to false. Valid values: `true`, `false`. ##### Cookies Arguments From b9aeafbbbabb1292dae484aa7db19981a2a53b69 Mon Sep 17 00:00:00 2001 From: saravanan30erd Date: Tue, 28 Aug 2018 20:50:51 +0400 Subject: [PATCH 016/184] add schema for cloudfront_pubkey --- aws/resource_aws_cloudfront_public_key.go | 58 +++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 aws/resource_aws_cloudfront_public_key.go diff --git a/aws/resource_aws_cloudfront_public_key.go b/aws/resource_aws_cloudfront_public_key.go new file mode 100644 index 00000000000..c0951ecb029 --- /dev/null +++ b/aws/resource_aws_cloudfront_public_key.go @@ -0,0 +1,58 @@ +package aws + +import ( + "fmt" + "log" + + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/cloudfront" + "github.com/hashicorp/terraform/helper/resource" + "github.com/hashicorp/terraform/helper/schema" +) + +func resourceAwsCloudFrontPublicKey() *schema.Resource { + return &schema.Resource{ + Create: resourceAwsCloudFrontPublicKeyCreate, + Read: resourceAwsCloudFrontPublicKeyRead, + Update: resourceAwsCloudFrontPublicKeyUpdate, + Delete: resourceAwsCloudFrontPublicKeyDelete, + + Schema: map[string]*schema.Schema{ + "name": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ForceNew: true, + ConflictsWith: []string{"name_prefix"}, + }, + "name_prefix": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ForceNew: true, + ConflictsWith: []string{"name"}, + }, + "encoded_key": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + "comment": { + Type: schema.TypeString, + Optional: true, + }, + "etag": { + Type: schema.TypeString, + Computed: true, + }, + "location": { + Type: schema.TypeString, + Computed: true, + }, + "id": { + Type: schema.TypeString, + Computed: true, + }, + }, + } +} From 9ad8a474dd36ca9714d00a91eb524d6d2bf5e7f6 Mon Sep 17 00:00:00 2001 From: uLan08 Date: Wed, 29 Aug 2018 20:45:26 +0800 Subject: [PATCH 017/184] Specify that security_groups field under aws_instance resource can also take in IDs --- website/docs/r/instance.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/instance.html.markdown b/website/docs/r/instance.html.markdown index 4410345445b..9e67eabbebd 100644 --- a/website/docs/r/instance.html.markdown +++ b/website/docs/r/instance.html.markdown @@ -77,7 +77,7 @@ instances. See [Shutdown Behavior](https://docs.aws.amazon.com/AWSEC2/latest/Use * `get_password_data` - (Optional) If true, wait for password data to become available and retrieve it. Useful for getting the administrator password for instances running Microsoft Windows. The password data is exported to the `password_data` attribute. See [GetPasswordData](https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_GetPasswordData.html) for more information. * `monitoring` - (Optional) If true, the launched EC2 instance will have detailed monitoring enabled. (Available since v0.6.0) -* `security_groups` - (Optional, EC2-Classic and default VPC only) A list of security group names to associate with. +* `security_groups` - (Optional, EC2-Classic and default VPC only) A list of security group names or IDs to associate with. -> **NOTE:** If you are creating Instances in a VPC, use `vpc_security_group_ids` instead. From e4a216e28224a127fa912cb4c8328862bbb7533c Mon Sep 17 00:00:00 2001 From: saravanan30erd Date: Wed, 29 Aug 2018 19:17:33 +0400 Subject: [PATCH 018/184] add validate func to verify key name --- aws/resource_aws_cloudfront_public_key.go | 2 ++ aws/validators.go | 27 +++++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/aws/resource_aws_cloudfront_public_key.go b/aws/resource_aws_cloudfront_public_key.go index c0951ecb029..4eea2c3534c 100644 --- a/aws/resource_aws_cloudfront_public_key.go +++ b/aws/resource_aws_cloudfront_public_key.go @@ -24,6 +24,7 @@ func resourceAwsCloudFrontPublicKey() *schema.Resource { Computed: true, ForceNew: true, ConflictsWith: []string{"name_prefix"}, + ValidateFunc: validateCloudFrontPublicKeyName, }, "name_prefix": { Type: schema.TypeString, @@ -31,6 +32,7 @@ func resourceAwsCloudFrontPublicKey() *schema.Resource { Computed: true, ForceNew: true, ConflictsWith: []string{"name"}, + ValidateFunc: validateCloudFrontPublicKeyNamePrefix, }, "encoded_key": { Type: schema.TypeString, diff --git a/aws/validators.go b/aws/validators.go index e834c9239be..c65ffd161ea 100644 --- a/aws/validators.go +++ b/aws/validators.go @@ -1974,3 +1974,30 @@ func validateNeptuneEventSubscriptionNamePrefix(v interface{}, k string) (ws []s } return } + +func validateCloudFrontPublicKeyName(v interface{}, k string) (ws []string, errors []error) { + value := v.(string) + if !regexp.MustCompile(`^[0-9A-Za-z_-]+$`).MatchString(value) { + errors = append(errors, fmt.Errorf( + "only alphanumeric characters, underscores and hyphens allowed in %q", k)) + } + if len(value) > 128 { + errors = append(errors, fmt.Errorf( + "%q cannot be greater than 128 characters", k)) + } + return +} + +func validateCloudFrontPublicKeyNamePrefix(v interface{}, k string) (ws []string, errors []error) { + value := v.(string) + if !regexp.MustCompile(`^[0-9A-Za-z_-]+$`).MatchString(value) { + errors = append(errors, fmt.Errorf( + "only alphanumeric characters, underscores and hyphens allowed in %q", k)) + } + prefixMaxLength := 128 - resource.UniqueIDSuffixLength + if len(value) > prefixMaxLength { + errors = append(errors, fmt.Errorf( + "%q cannot be greater than %d characters", k, prefixMaxLength)) + } + return +} From 0975ac0327099ce2a4416aad3338cd00a64e9725 Mon Sep 17 00:00:00 2001 From: saravanan30erd Date: Wed, 29 Aug 2018 20:03:31 +0400 Subject: [PATCH 019/184] add create func for cloudfront_pubkey --- aws/resource_aws_cloudfront_public_key.go | 44 ++++++++++++++++++++--- 1 file changed, 40 insertions(+), 4 deletions(-) diff --git a/aws/resource_aws_cloudfront_public_key.go b/aws/resource_aws_cloudfront_public_key.go index 4eea2c3534c..265ac579c7f 100644 --- a/aws/resource_aws_cloudfront_public_key.go +++ b/aws/resource_aws_cloudfront_public_key.go @@ -47,10 +47,6 @@ func resourceAwsCloudFrontPublicKey() *schema.Resource { Type: schema.TypeString, Computed: true, }, - "location": { - Type: schema.TypeString, - Computed: true, - }, "id": { Type: schema.TypeString, Computed: true, @@ -58,3 +54,43 @@ func resourceAwsCloudFrontPublicKey() *schema.Resource { }, } } + +func resourceAwsCloudFrontPublicKeyCreate(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).cloudfrontconn + + if v, ok := d.GetOk("name"); ok { + d.Set("name", v.(string)) + } else if v, ok := d.GetOk("name_prefix"); ok { + d.Set("name", resource.PrefixedUniqueId(v.(string))) + } else { + d.Set("name", resource.PrefixedUniqueId("tf-")) + } + + request := &cloudfront.CreatePublicKeyInput{ + PublicKeyConfig: expandPublicKeyConfig(d), + } + + log.Println("[DEBUG] Create CloudFront PublicKey:", request) + + output, err := conn.CreatePublicKey(request) + if err != nil { + return fmt.Errorf("error creating CloudFront PublicKey: %s", err) + } + + d.SetId(aws.StringValue(output.PublicKey.Id)) + return resourceAwsCloudFrontPublicKeyRead(d, meta) +} + +func expandPublicKeyConfig(d *schema.ResourceData) *cloudfront.PublicKeyConfig { + publicKeyConfig := &cloudfront.PublicKeyConfig{ + CallerReference: aws.String(resource.UniqueId()), + EncodedKey: aws.String(d.Get("encoded_key").(string)), + Name: aws.String(d.Get("name").(string)), + } + + if v, ok := d.GetOk("comment"); ok { + publicKeyConfig.Comment = aws.String(v.(string)) + } + + return publicKeyConfig +} From 7d299ec4fcf15065c6f0bad5a0e5a1eb8c91b23f Mon Sep 17 00:00:00 2001 From: saravanan30erd Date: Wed, 29 Aug 2018 20:32:08 +0400 Subject: [PATCH 020/184] add read func for cloudfront_pubkey --- aws/resource_aws_cloudfront_public_key.go | 30 +++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/aws/resource_aws_cloudfront_public_key.go b/aws/resource_aws_cloudfront_public_key.go index 265ac579c7f..3305b4a8154 100644 --- a/aws/resource_aws_cloudfront_public_key.go +++ b/aws/resource_aws_cloudfront_public_key.go @@ -81,6 +81,36 @@ func resourceAwsCloudFrontPublicKeyCreate(d *schema.ResourceData, meta interface return resourceAwsCloudFrontPublicKeyRead(d, meta) } +func resourceAwsCloudFrontPublicKeyRead(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).cloudfrontconn + request := &cloudfront.GetPublicKeyInput{ + Id: aws.String(d.Id()), + } + + output, err := conn.GetPublicKey(request) + if err != nil { + if isAWSErr(err, cloudfront.ErrCodeNoSuchPublicKey, "") { + log.Printf("[WARN] No PublicKey found: %s, removing from state", d.Id()) + d.SetId("") + return nil + } + return err + } + + var publicKeyConfig *cloudfront.PublicKeyConfig + publicKeyConfig = output.PublicKey.PublicKeyConfig + + d.Set("encoded_key", publicKeyConfig.EncodedKey) + d.Set("name", publicKeyConfig.Name) + if publicKeyConfig.Comment != nil { + d.Set("comment", publicKeyConfig.Comment) + } + + d.Set("etag", output.ETag) + + return nil +} + func expandPublicKeyConfig(d *schema.ResourceData) *cloudfront.PublicKeyConfig { publicKeyConfig := &cloudfront.PublicKeyConfig{ CallerReference: aws.String(resource.UniqueId()), From bc0af850218294eb4456b8fc668cc62c8502ceab Mon Sep 17 00:00:00 2001 From: saravanan30erd Date: Wed, 29 Aug 2018 20:47:30 +0400 Subject: [PATCH 021/184] update cloudfront_pubkey resource in provider --- aws/provider.go | 1 + 1 file changed, 1 insertion(+) diff --git a/aws/provider.go b/aws/provider.go index bf80ad57383..b985dff5825 100644 --- a/aws/provider.go +++ b/aws/provider.go @@ -325,6 +325,7 @@ func Provider() terraform.ResourceProvider { "aws_cloudformation_stack": resourceAwsCloudFormationStack(), "aws_cloudfront_distribution": resourceAwsCloudFrontDistribution(), "aws_cloudfront_origin_access_identity": resourceAwsCloudFrontOriginAccessIdentity(), + "aws_cloudfront_public_key": resourceAwsCloudFrontPublicKey(), "aws_cloudtrail": resourceAwsCloudTrail(), "aws_cloudwatch_event_permission": resourceAwsCloudWatchEventPermission(), "aws_cloudwatch_event_rule": resourceAwsCloudWatchEventRule(), From d0464c975ffcabaec53c04e934d90b2bddaa92bd Mon Sep 17 00:00:00 2001 From: "B. Doepfner" Date: Thu, 30 Aug 2018 14:14:24 +0200 Subject: [PATCH 022/184] Add 'Seperator' property to AWS IoT Firehose Rule --- aws/resource_aws_iot_topic_rule.go | 11 ++++++++++- aws/resource_aws_iot_topic_rule_test.go | 1 + aws/structure.go | 1 + aws/validators.go | 13 +++++++++++++ website/docs/r/iot_topic_rule.html.markdown | 1 + 5 files changed, 26 insertions(+), 1 deletion(-) diff --git a/aws/resource_aws_iot_topic_rule.go b/aws/resource_aws_iot_topic_rule.go index 0017db710df..36500a6d43d 100644 --- a/aws/resource_aws_iot_topic_rule.go +++ b/aws/resource_aws_iot_topic_rule.go @@ -190,6 +190,11 @@ func resourceAwsIotTopicRule() *schema.Resource { Required: true, ValidateFunc: validateArn, }, + "separator": { + Type: schema.TypeString, + Optional: true, + ValidateFunc: validateIoTTopicRuleFirehoseSeparator, + }, }, }, }, @@ -413,12 +418,16 @@ func createTopicRulePayload(d *schema.ResourceData) *iot.TopicRulePayload { for _, a := range firehoseActions { raw := a.(map[string]interface{}) - actions[i] = &iot.Action{ + act := &iot.Action{ Firehose: &iot.FirehoseAction{ DeliveryStreamName: aws.String(raw["delivery_stream_name"].(string)), RoleArn: aws.String(raw["role_arn"].(string)), }, } + if v, ok := raw["separator"].(string); ok && v != "" { + act.Firehose.Separator = aws.String(raw["separator"].(string)) + } + actions[i] = act i++ } diff --git a/aws/resource_aws_iot_topic_rule_test.go b/aws/resource_aws_iot_topic_rule_test.go index accad077660..5141f5a678a 100644 --- a/aws/resource_aws_iot_topic_rule_test.go +++ b/aws/resource_aws_iot_topic_rule_test.go @@ -387,6 +387,7 @@ resource "aws_iot_topic_rule" "rule" { firehose { delivery_stream_name = "mystream" role_arn = "${aws_iam_role.iot_role.arn}" + separator = "\n" } } `, rName) diff --git a/aws/structure.go b/aws/structure.go index 924da6b901b..2fe4161a3bd 100644 --- a/aws/structure.go +++ b/aws/structure.go @@ -2754,6 +2754,7 @@ func flattenIoTRuleFirehoseActions(actions []*iot.Action) []map[string]interface if v != nil { result["role_arn"] = *v.RoleArn result["delivery_stream_name"] = *v.DeliveryStreamName + result["separator"] = *v.Separator results = append(results, result) } diff --git a/aws/validators.go b/aws/validators.go index e834c9239be..a56ba272cd2 100644 --- a/aws/validators.go +++ b/aws/validators.go @@ -1625,6 +1625,19 @@ func validateIoTTopicRuleElasticSearchEndpoint(v interface{}, k string) (ws []st return } +func validateIoTTopicRuleFirehoseSeparator(v interface{}, s string) ([]string, []error) { + switch v.(string) { + case + ",", + "\t", + "\n", + "\r\n": + return nil, nil + } + + return nil, []error{fmt.Errorf("Separator must be one of ',' (comma), '\t' (tab) '\n' (newline) or '\r\n' (Windows newline)")} +} + func validateCognitoRoleMappingsAmbiguousRoleResolutionAgainstType(v map[string]interface{}) (errors []error) { t := v["type"].(string) isRequired := t == cognitoidentity.RoleMappingTypeToken || t == cognitoidentity.RoleMappingTypeRules diff --git a/website/docs/r/iot_topic_rule.html.markdown b/website/docs/r/iot_topic_rule.html.markdown index 52b465b45dd..365905c5cf8 100644 --- a/website/docs/r/iot_topic_rule.html.markdown +++ b/website/docs/r/iot_topic_rule.html.markdown @@ -115,6 +115,7 @@ The `firehose` object takes the following arguments: * `delivery_stream_name` - (Required) The delivery stream name. * `role_arn` - (Required) The IAM role ARN that grants access to the Amazon Kinesis Firehose stream. +* `separator` - (Optional) A character separator that is used to separate records written to the Firehose stream. Valid values are: '\n' (newline), '\t' (tab), '\r\n' (Windows newline), ',' (comma). The `kinesis` object takes the following arguments: From 8c2d1db56c8ebf62dbca3b034547f0970df6fa1a Mon Sep 17 00:00:00 2001 From: saravanan30erd Date: Thu, 30 Aug 2018 18:44:30 +0400 Subject: [PATCH 023/184] add update func for cloudfront_pubkey --- aws/resource_aws_cloudfront_public_key.go | 34 +++++++++++++++++------ 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/aws/resource_aws_cloudfront_public_key.go b/aws/resource_aws_cloudfront_public_key.go index 3305b4a8154..4323cd546b2 100644 --- a/aws/resource_aws_cloudfront_public_key.go +++ b/aws/resource_aws_cloudfront_public_key.go @@ -19,25 +19,25 @@ func resourceAwsCloudFrontPublicKey() *schema.Resource { Schema: map[string]*schema.Schema{ "name": { - Type: schema.TypeString, - Optional: true, - Computed: true, - ForceNew: true, + Type: schema.TypeString, + Optional: true, + Computed: true, + //ForceNew: true, ConflictsWith: []string{"name_prefix"}, ValidateFunc: validateCloudFrontPublicKeyName, }, "name_prefix": { - Type: schema.TypeString, - Optional: true, - Computed: true, - ForceNew: true, + Type: schema.TypeString, + Optional: true, + Computed: true, + //ForceNew: true, ConflictsWith: []string{"name"}, ValidateFunc: validateCloudFrontPublicKeyNamePrefix, }, "encoded_key": { Type: schema.TypeString, Required: true, - ForceNew: true, + //ForceNew: true, }, "comment": { Type: schema.TypeString, @@ -111,6 +111,22 @@ func resourceAwsCloudFrontPublicKeyRead(d *schema.ResourceData, meta interface{} return nil } +func resourceAwsCloudFrontPublicKeyUpdate(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).cloudfrontconn + request := &cloudfront.UpdatePublicKeyInput{ + Id: aws.String(d.Id()), + PublicKeyConfig: expandPublicKeyConfig(d), + IfMatch: aws.String(d.Get("etag").(string)), + } + + _, err := conn.UpdatePublicKey(request) + if err != nil { + return fmt.Errorf("error updating CloudFront PublicKey (%s): %s", d.Id(), err) + } + + return resourceAwsCloudFrontPublicKeyRead(d, meta) +} + func expandPublicKeyConfig(d *schema.ResourceData) *cloudfront.PublicKeyConfig { publicKeyConfig := &cloudfront.PublicKeyConfig{ CallerReference: aws.String(resource.UniqueId()), From 32ca92190fd79eb77e63d78e879c2f72cefdd2a2 Mon Sep 17 00:00:00 2001 From: saravanan30erd Date: Thu, 30 Aug 2018 18:52:00 +0400 Subject: [PATCH 024/184] add delete func --- aws/resource_aws_cloudfront_public_key.go | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/aws/resource_aws_cloudfront_public_key.go b/aws/resource_aws_cloudfront_public_key.go index 4323cd546b2..8059b4590a3 100644 --- a/aws/resource_aws_cloudfront_public_key.go +++ b/aws/resource_aws_cloudfront_public_key.go @@ -113,6 +113,7 @@ func resourceAwsCloudFrontPublicKeyRead(d *schema.ResourceData, meta interface{} func resourceAwsCloudFrontPublicKeyUpdate(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).cloudfrontconn + request := &cloudfront.UpdatePublicKeyInput{ Id: aws.String(d.Id()), PublicKeyConfig: expandPublicKeyConfig(d), @@ -127,6 +128,27 @@ func resourceAwsCloudFrontPublicKeyUpdate(d *schema.ResourceData, meta interface return resourceAwsCloudFrontPublicKeyRead(d, meta) } +func resourceAwsCloudFrontPublicKeyDelete(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).cloudfrontconn + + request := &cloudfront.DeletePublicKeyInput{ + Id: aws.String(d.Id()), + IfMatch: aws.String(d.Get("etag").(string)), + } + + _, err := conn.DeletePublicKey(request) + if err != nil { + if isAWSErr(err, cloudfront.ErrCodeNoSuchPublicKey, "") { + log.Printf("[WARN] No PublicKey found: %s, removing from state", d.Id()) + d.SetId("") + return nil + } + return err + } + + return nil +} + func expandPublicKeyConfig(d *schema.ResourceData) *cloudfront.PublicKeyConfig { publicKeyConfig := &cloudfront.PublicKeyConfig{ CallerReference: aws.String(resource.UniqueId()), From 745daa882a3995da0fc5f01d946076eb81e2cf37 Mon Sep 17 00:00:00 2001 From: saravanan30erd Date: Thu, 30 Aug 2018 19:03:15 +0400 Subject: [PATCH 025/184] fix the id issue --- aws/resource_aws_cloudfront_public_key.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/aws/resource_aws_cloudfront_public_key.go b/aws/resource_aws_cloudfront_public_key.go index 8059b4590a3..82b5e081399 100644 --- a/aws/resource_aws_cloudfront_public_key.go +++ b/aws/resource_aws_cloudfront_public_key.go @@ -47,10 +47,6 @@ func resourceAwsCloudFrontPublicKey() *schema.Resource { Type: schema.TypeString, Computed: true, }, - "id": { - Type: schema.TypeString, - Computed: true, - }, }, } } From 489865243405952a0f66e61c74e93bc127d519a9 Mon Sep 17 00:00:00 2001 From: saravanan30erd Date: Thu, 30 Aug 2018 19:25:34 +0400 Subject: [PATCH 026/184] fix the issues in update func --- aws/resource_aws_cloudfront_public_key.go | 39 ++++++++++++++++------- 1 file changed, 27 insertions(+), 12 deletions(-) diff --git a/aws/resource_aws_cloudfront_public_key.go b/aws/resource_aws_cloudfront_public_key.go index 82b5e081399..4c6f6592982 100644 --- a/aws/resource_aws_cloudfront_public_key.go +++ b/aws/resource_aws_cloudfront_public_key.go @@ -3,6 +3,7 @@ package aws import ( "fmt" "log" + "time" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/cloudfront" @@ -19,25 +20,25 @@ func resourceAwsCloudFrontPublicKey() *schema.Resource { Schema: map[string]*schema.Schema{ "name": { - Type: schema.TypeString, - Optional: true, - Computed: true, - //ForceNew: true, + Type: schema.TypeString, + Optional: true, + Computed: true, + ForceNew: true, ConflictsWith: []string{"name_prefix"}, ValidateFunc: validateCloudFrontPublicKeyName, }, "name_prefix": { - Type: schema.TypeString, - Optional: true, - Computed: true, - //ForceNew: true, + Type: schema.TypeString, + Optional: true, + Computed: true, + ForceNew: true, ConflictsWith: []string{"name"}, ValidateFunc: validateCloudFrontPublicKeyNamePrefix, }, "encoded_key": { Type: schema.TypeString, Required: true, - //ForceNew: true, + ForceNew: true, }, "comment": { Type: schema.TypeString, @@ -47,6 +48,10 @@ func resourceAwsCloudFrontPublicKey() *schema.Resource { Type: schema.TypeString, Computed: true, }, + "caller_reference": { + Type: schema.TypeString, + Computed: true, + }, }, } } @@ -98,10 +103,15 @@ func resourceAwsCloudFrontPublicKeyRead(d *schema.ResourceData, meta interface{} d.Set("encoded_key", publicKeyConfig.EncodedKey) d.Set("name", publicKeyConfig.Name) + if publicKeyConfig.Comment != nil { d.Set("comment", publicKeyConfig.Comment) } + if publicKeyConfig.CallerReference != nil { + d.Set("caller_reference", publicKeyConfig.CallerReference) + } + d.Set("etag", output.ETag) return nil @@ -147,14 +157,19 @@ func resourceAwsCloudFrontPublicKeyDelete(d *schema.ResourceData, meta interface func expandPublicKeyConfig(d *schema.ResourceData) *cloudfront.PublicKeyConfig { publicKeyConfig := &cloudfront.PublicKeyConfig{ - CallerReference: aws.String(resource.UniqueId()), - EncodedKey: aws.String(d.Get("encoded_key").(string)), - Name: aws.String(d.Get("name").(string)), + EncodedKey: aws.String(d.Get("encoded_key").(string)), + Name: aws.String(d.Get("name").(string)), } if v, ok := d.GetOk("comment"); ok { publicKeyConfig.Comment = aws.String(v.(string)) } + if v, ok := d.GetOk("caller_reference"); ok { + publicKeyConfig.CallerReference = aws.String(v.(string)) + } else { + publicKeyConfig.CallerReference = aws.String(time.Now().Format(time.RFC3339Nano)) + } + return publicKeyConfig } From 9f50045ef15de3e3ba16db41654435986250db57 Mon Sep 17 00:00:00 2001 From: saravanan30erd Date: Thu, 30 Aug 2018 19:47:45 +0400 Subject: [PATCH 027/184] add unit tests for cloudfront_pubkey name validate funcs --- aws/validators_test.go | 56 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/aws/validators_test.go b/aws/validators_test.go index 5427d1c6a2f..0bb36a23d15 100644 --- a/aws/validators_test.go +++ b/aws/validators_test.go @@ -2809,3 +2809,59 @@ func TestValidateNeptuneParamGroupNamePrefix(t *testing.T) { } } } + +func TestValidateCloudFrontPublicKeyName(t *testing.T) { + cases := []struct { + Value string + ErrCount int + }{ + { + Value: "testing123!", + ErrCount: 1, + }, + { + Value: "testing 123", + ErrCount: 1, + }, + { + Value: randomString(129), + ErrCount: 1, + }, + } + + for _, tc := range cases { + _, errors := validateCloudFrontPublicKeyName(tc.Value, "aws_cloudfront_public_key") + + if len(errors) != tc.ErrCount { + t.Fatalf("Expected the CloudFront PublicKey Name to trigger a validation error for %q", tc.Value) + } + } +} + +func TestValidateCloudFrontPublicKeyNamePrefix(t *testing.T) { + cases := []struct { + Value string + ErrCount int + }{ + { + Value: "testing123!", + ErrCount: 1, + }, + { + Value: "testing 123", + ErrCount: 1, + }, + { + Value: randomString(128), + ErrCount: 1, + }, + } + + for _, tc := range cases { + _, errors := validateCloudFrontPublicKeyNamePrefix(tc.Value, "aws_cloudfront_public_key") + + if len(errors) != tc.ErrCount { + t.Fatalf("Expected the CloudFront PublicKey Name to trigger a validation error for %q", tc.Value) + } + } +} From b83a500057ce261071d45cca2d3c46b763bcf405 Mon Sep 17 00:00:00 2001 From: saravanan30erd Date: Thu, 30 Aug 2018 21:53:43 +0400 Subject: [PATCH 028/184] add acceptance test for cloudfront_pubkey --- ...resource_aws_cloudfront_public_key_test.go | 156 ++++++++++++++++++ aws/test-fixtures/cloudfront-public-key.pem | 9 + 2 files changed, 165 insertions(+) create mode 100644 aws/resource_aws_cloudfront_public_key_test.go create mode 100644 aws/test-fixtures/cloudfront-public-key.pem diff --git a/aws/resource_aws_cloudfront_public_key_test.go b/aws/resource_aws_cloudfront_public_key_test.go new file mode 100644 index 00000000000..f3bf1787d29 --- /dev/null +++ b/aws/resource_aws_cloudfront_public_key_test.go @@ -0,0 +1,156 @@ +package aws + +import ( + "fmt" + "regexp" + "testing" + + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/cloudfront" + "github.com/hashicorp/terraform/helper/acctest" + "github.com/hashicorp/terraform/helper/resource" + "github.com/hashicorp/terraform/terraform" +) + +func TestAccAWSCloudFrontPublicKey_basic(t *testing.T) { + rInt := acctest.RandInt() + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckCloudFrontPublicKeyDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSCloudFrontPublicKeyConfig(rInt), + Check: resource.ComposeTestCheckFunc( + testAccCheckCloudFrontPublicKeyExistence("aws_cloudfront_public_key.example"), + resource.TestCheckResourceAttr("aws_cloudfront_public_key.example", "comment", "test key"), + resource.TestMatchResourceAttr("aws_cloudfront_public_key.example", + "caller_reference", + regexp.MustCompile("^20[0-9]{2}.*")), + resource.TestCheckResourceAttr("aws_cloudfront_public_key.example", "name", fmt.Sprintf("tf-acc-test-%d", rInt)), + ), + }, + }, + }) +} + +func TestAccAWSCloudFrontPublicKey_namePrefix(t *testing.T) { + startsWithPrefix := regexp.MustCompile("^tf-acc-test-") + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckCloudFrontPublicKeyDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSCloudFrontPublicKeyConfig_namePrefix(), + Check: resource.ComposeTestCheckFunc( + testAccCheckCloudFrontPublicKeyExistence("aws_cloudfront_public_key.example"), + resource.TestMatchResourceAttr("aws_cloudfront_public_key.example", "name", startsWithPrefix), + ), + }, + }, + }) +} + +func TestAccAWSCloudFrontPublicKey_update(t *testing.T) { + rInt := acctest.RandInt() + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckCloudFrontPublicKeyDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSCloudFrontPublicKeyConfig(rInt), + Check: resource.ComposeTestCheckFunc( + testAccCheckCloudFrontPublicKeyExistence("aws_cloudfront_public_key.example"), + resource.TestCheckResourceAttr("aws_cloudfront_public_key.example", "comment", "test key"), + ), + }, + { + Config: testAccAWSCloudFrontPublicKeyConfigUpdate(rInt), + Check: resource.ComposeTestCheckFunc( + testAccCheckCloudFrontPublicKeyExistence("aws_cloudfront_public_key.example"), + resource.TestCheckResourceAttr("aws_cloudfront_public_key.example", "comment", "test key1"), + ), + }, + }, + }) +} + +func testAccCheckCloudFrontPublicKeyExistence(r string) resource.TestCheckFunc { + return func(s *terraform.State) error { + rs, ok := s.RootModule().Resources[r] + if !ok { + return fmt.Errorf("Not found: %s", r) + } + if rs.Primary.ID == "" { + return fmt.Errorf("No Id is set") + } + + conn := testAccProvider.Meta().(*AWSClient).cloudfrontconn + + params := &cloudfront.GetPublicKeyInput{ + Id: aws.String(rs.Primary.ID), + } + + _, err := conn.GetPublicKey(params) + if err != nil { + return fmt.Errorf("Error retrieving CloudFront PublicKey: %s", err) + } + return nil + } +} + +func testAccCheckCloudFrontPublicKeyDestroy(s *terraform.State) error { + conn := testAccProvider.Meta().(*AWSClient).cloudfrontconn + + for _, rs := range s.RootModule().Resources { + if rs.Type != "aws_cloudfront_public_key" { + continue + } + + params := &cloudfront.GetPublicKeyInput{ + Id: aws.String(rs.Primary.ID), + } + + _, err := conn.GetPublicKey(params) + if err == nil { + return fmt.Errorf("CloudFront PublicKey was not deleted") + } + } + + return nil +} + +func testAccAWSCloudFrontPublicKeyConfig(rInt int) string { + return fmt.Sprintf(` + resource "aws_cloudfront_public_key" "example" { + comment = "test key" + encoded_key = "${file("test-fixtures/cloudfront-public-key.pem")}" + name = "tf-acc-test-%d" +} +`, rInt) +} + +func testAccAWSCloudFrontPublicKeyConfig_namePrefix() string { + return fmt.Sprintf(` + resource "aws_cloudfront_public_key" "example" { + comment = "test key" + encoded_key = "${file("test-fixtures/cloudfront-public-key.pem")}" + name_prefix = "tf-acc-test-" +} +`) +} + +func testAccAWSCloudFrontPublicKeyConfigUpdate(rInt int) string { + return fmt.Sprintf(` + resource "aws_cloudfront_public_key" "example" { + comment = "test key1" + encoded_key = "${file("test-fixtures/cloudfront-public-key.pem")}" + name = "tf-acc-test-%d" +} +`, rInt) +} diff --git a/aws/test-fixtures/cloudfront-public-key.pem b/aws/test-fixtures/cloudfront-public-key.pem new file mode 100644 index 00000000000..d25ae696d39 --- /dev/null +++ b/aws/test-fixtures/cloudfront-public-key.pem @@ -0,0 +1,9 @@ +-----BEGIN PUBLIC KEY----- +MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtZCjGTEV/ttumSJBnsc2 +SUzPY/wJjfNchT2mjWivg/S7HuwKp1tDHizxrXTVuZLdDKceVcSclS7otzwfmGxM +Gjk2/CM2hEMThT86q76TrbH6hvGa25n8piBOkhwbwdbvmg3DRJiLR9bqw+nAPt/n +1ggTcwazm1Bw7y112Ardop+buWirS3w2C6au2OdloaaLz5N1eHEHQuRpnmD+UoVR +OgGeaLaU7FxKkpOps4Giu4vgjcefGlM3MrqG4FAzDMtgGZdJm4U+bldYmk0+J1yv +JA0FGd9g9GhjHMT9UznxXccw7PhHQsXn4lQfOn47uO9KIq170t8FeHKEzbCMsmyA +2QIDAQAB +-----END PUBLIC KEY----- From e1f73b09546332a17232c6fe9a24f3bdc8c507ae Mon Sep 17 00:00:00 2001 From: saravanan30erd Date: Thu, 30 Aug 2018 22:21:01 +0400 Subject: [PATCH 029/184] add documentation --- website/aws.erb | 3 ++ .../r/cloudfront_public_key.html.markdown | 38 +++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 website/docs/r/cloudfront_public_key.html.markdown diff --git a/website/aws.erb b/website/aws.erb index c5710e4ddc8..1ee142c3477 100644 --- a/website/aws.erb +++ b/website/aws.erb @@ -566,6 +566,9 @@ > aws_cloudfront_origin_access_identity + > + aws_cloudfront_public_key + diff --git a/website/docs/r/cloudfront_public_key.html.markdown b/website/docs/r/cloudfront_public_key.html.markdown new file mode 100644 index 00000000000..11b4174be14 --- /dev/null +++ b/website/docs/r/cloudfront_public_key.html.markdown @@ -0,0 +1,38 @@ +--- +layout: "aws" +page_title: "AWS: cloudfront_public_key" +sidebar_current: "docs-aws-resource-cloudfront-public-key" +description: |- + Provides a CloudFront Public Key which you add to CloudFront to use with features like field-level encryption. +--- + +# aws_cloudfront_distribution + +## Example Usage + +The following example below creates a CloudFront public key. + +```hcl +resource "aws_cloudfront_public_key" "example" { + comment = "test public key" + encoded_key = "${file("public_key.pem")}" + name = "test_key" +} +``` + +## Argument Reference + +The following arguments are supported: + +* `comment` - (Optional) An optional comment about the public key. +* `encoded_key` - (Required) The encoded public key that you want to add to CloudFront to use with features like field-level encryption. +* `name` - (Optional) The name for the public key. By default generated by Terraform. +* `name_prefix` - (Optional) The name for the public key. Conflicts with `name`. + +## Attributes Reference + +In addition to all arguments above, the following attributes are exported: + +* `caller_reference` - Internal value used by CloudFront to allow future updates to the public key configuration. +* `etag` - The current version of the public key. For example: `E2QWRUHAPOMQZL`. +* `id` - The identifier for the public key. For example: `K3D5EWEUDCCXON`. From abfe7c49e90810657e9ed6b9401f2e3c439fcefc Mon Sep 17 00:00:00 2001 From: saravanan30erd Date: Thu, 30 Aug 2018 22:29:52 +0400 Subject: [PATCH 030/184] arrange the attributes order properly --- aws/resource_aws_cloudfront_public_key.go | 34 +++++++++++------------ 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/aws/resource_aws_cloudfront_public_key.go b/aws/resource_aws_cloudfront_public_key.go index 4c6f6592982..7a6e819909f 100644 --- a/aws/resource_aws_cloudfront_public_key.go +++ b/aws/resource_aws_cloudfront_public_key.go @@ -19,6 +19,23 @@ func resourceAwsCloudFrontPublicKey() *schema.Resource { Delete: resourceAwsCloudFrontPublicKeyDelete, Schema: map[string]*schema.Schema{ + "caller_reference": { + Type: schema.TypeString, + Computed: true, + }, + "comment": { + Type: schema.TypeString, + Optional: true, + }, + "encoded_key": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + "etag": { + Type: schema.TypeString, + Computed: true, + }, "name": { Type: schema.TypeString, Optional: true, @@ -35,23 +52,6 @@ func resourceAwsCloudFrontPublicKey() *schema.Resource { ConflictsWith: []string{"name"}, ValidateFunc: validateCloudFrontPublicKeyNamePrefix, }, - "encoded_key": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - }, - "comment": { - Type: schema.TypeString, - Optional: true, - }, - "etag": { - Type: schema.TypeString, - Computed: true, - }, - "caller_reference": { - Type: schema.TypeString, - Computed: true, - }, }, } } From eeb04c6a07450348b92bfa80e904f73778b5ccf8 Mon Sep 17 00:00:00 2001 From: Bastiaan Schaap Date: Fri, 31 Aug 2018 07:26:11 +0200 Subject: [PATCH 031/184] Add TypeStringBoolean equivalence from #5632 --- aws/resource_aws_launch_template.go | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/aws/resource_aws_launch_template.go b/aws/resource_aws_launch_template.go index 067d711c40c..7f148e6f33f 100644 --- a/aws/resource_aws_launch_template.go +++ b/aws/resource_aws_launch_template.go @@ -159,13 +159,14 @@ func resourceAwsLaunchTemplate() *schema.Resource { }, "ebs_optimized": { - Type: schema.TypeString, - Optional: true, - ValidateFunc: validation.StringInSlice([]string{ - "", - "false", - "true", - }, false), + // Use TypeString to allow an "unspecified" value, + // since TypeBool only has true/false with false default. + // The conversion from bare true/false values in + // configurations to TypeString value is currently safe. + Type: schema.TypeString, + Optional: true, + DiffSuppressFunc: suppressEquivalentTypeStringBoolean, + ValidateFunc: validateTypeStringNullableBoolean, }, "elastic_gpu_specifications": { From cb3bd94ff162f33550dc29bd2f88d385eed3b36c Mon Sep 17 00:00:00 2001 From: Dan Brown Date: Fri, 31 Aug 2018 14:20:40 +0100 Subject: [PATCH 032/184] Add working URL for ICMP types and codes --- website/docs/r/network_acl.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/network_acl.html.markdown b/website/docs/r/network_acl.html.markdown index 7f0472f5fad..4a9c45e87dc 100644 --- a/website/docs/r/network_acl.html.markdown +++ b/website/docs/r/network_acl.html.markdown @@ -73,7 +73,7 @@ valid network mask. * `icmp_type` - (Optional) The ICMP type to be used. Default 0. * `icmp_code` - (Optional) The ICMP type code to be used. Default 0. -~> Note: For more information on ICMP types and codes, see here: http://www.nthelp.com/icmp.html +~> Note: For more information on ICMP types and codes, see here: https://www.iana.org/assignments/icmp-parameters/icmp-parameters.xhtml ## Attributes Reference From ba713b9b051c638ca6cb4698fe4256e53494d11b Mon Sep 17 00:00:00 2001 From: Dan Brown Date: Fri, 31 Aug 2018 15:53:56 +0100 Subject: [PATCH 033/184] Add working URL for ICMP types and codes --- aws/resource_aws_network_acl_rule.go | 2 +- website/docs/r/default_network_acl.html.markdown | 2 +- website/docs/r/network_acl_rule.html.markdown | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/aws/resource_aws_network_acl_rule.go b/aws/resource_aws_network_acl_rule.go index 6a17cdcea4a..99157218bd0 100644 --- a/aws/resource_aws_network_acl_rule.go +++ b/aws/resource_aws_network_acl_rule.go @@ -133,7 +133,7 @@ func resourceAwsNetworkAclRuleCreate(d *schema.ResourceData, meta interface{}) e } // Specify additional required fields for ICMP. For the list - // of ICMP codes and types, see: http://www.nthelp.com/icmp.html + // of ICMP codes and types, see: https://www.iana.org/assignments/icmp-parameters/icmp-parameters.xhtml if p == 1 { params.IcmpTypeCode = &ec2.IcmpTypeCode{} if v, ok := d.GetOk("icmp_type"); ok { diff --git a/website/docs/r/default_network_acl.html.markdown b/website/docs/r/default_network_acl.html.markdown index eddd871f8d9..13524575805 100644 --- a/website/docs/r/default_network_acl.html.markdown +++ b/website/docs/r/default_network_acl.html.markdown @@ -135,7 +135,7 @@ valid network mask. * `icmp_type` - (Optional) The ICMP type to be used. Default 0. * `icmp_code` - (Optional) The ICMP type code to be used. Default 0. -~> Note: For more information on ICMP types and codes, see here: http://www.nthelp.com/icmp.html +~> Note: For more information on ICMP types and codes, see here: https://www.iana.org/assignments/icmp-parameters/icmp-parameters.xhtml ### Managing Subnets in the Default Network ACL diff --git a/website/docs/r/network_acl_rule.html.markdown b/website/docs/r/network_acl_rule.html.markdown index f8c8dd06fc1..9b5d55713ef 100644 --- a/website/docs/r/network_acl_rule.html.markdown +++ b/website/docs/r/network_acl_rule.html.markdown @@ -57,7 +57,7 @@ The following arguments are supported: ~> **NOTE:** If the value of `icmp_type` is `-1` (which results in a wildcard ICMP type), the `icmp_code` must also be set to `-1` (wildcard ICMP code). -~> Note: For more information on ICMP types and codes, see here: http://www.nthelp.com/icmp.html +~> Note: For more information on ICMP types and codes, see here: https://www.iana.org/assignments/icmp-parameters/icmp-parameters.xhtml ## Attributes Reference From 4d08acbb9dcecabb49d8dc62614bb33b54d44ccb Mon Sep 17 00:00:00 2001 From: saravanan30erd Date: Fri, 31 Aug 2018 19:04:28 +0400 Subject: [PATCH 034/184] unit tests for validate funcs in neptune --- ...a_source_aws_cloudformation_export_test.go | 2 +- aws/opsworks_layers.go | 24 +++--- ...source_aws_acmpca_certificate_authority.go | 6 +- aws/resource_aws_api_gateway_integration.go | 30 ++++---- ...e_aws_cloudfront_origin_access_identity.go | 4 +- ...ce_aws_codedeploy_deployment_group_test.go | 8 +- aws/resource_aws_db_instance.go | 2 +- aws/resource_aws_db_security_group.go | 2 +- aws/resource_aws_dms_replication_instance.go | 2 +- ...sticache_replication_group_migrate_test.go | 2 +- ...resource_aws_emr_security_configuration.go | 2 +- aws/resource_aws_gamelift_fleet.go | 10 +-- aws/resource_aws_instance.go | 12 +-- aws/resource_aws_instance_migrate_test.go | 8 +- ...ce_aws_kinesis_firehose_delivery_stream.go | 10 +-- aws/resource_aws_neptune_cluster_instance.go | 2 +- ...rce_aws_neptune_cluster_parameter_group.go | 2 +- aws/resource_aws_rds_cluster_instance.go | 2 +- ...esource_aws_rds_cluster_parameter_group.go | 2 +- aws/resource_aws_redshift_cluster.go | 2 +- aws/resource_aws_route53_record.go | 4 +- aws/resource_aws_s3_bucket.go | 4 +- aws/resource_aws_s3_bucket_inventory.go | 4 +- aws/resource_aws_s3_bucket_notification.go | 4 +- ...esource_aws_security_group_migrate_test.go | 2 +- ..._service_discovery_service_migrate_test.go | 4 +- aws/resource_aws_sns_topic.go | 8 +- aws/resource_aws_spot_fleet_request.go | 2 +- aws/resource_aws_spot_instance_request.go | 4 +- aws/resource_aws_ssm_maintenance_window.go | 8 +- aws/resource_aws_ssm_patch_baseline.go | 2 +- aws/resource_aws_swf_domain.go | 2 +- aws/resource_aws_vpc.go | 2 +- aws/validators_test.go | 76 +++++++++++++++++-- 34 files changed, 160 insertions(+), 100 deletions(-) diff --git a/aws/data_source_aws_cloudformation_export_test.go b/aws/data_source_aws_cloudformation_export_test.go index e76f91e20b0..1ca42d7bc43 100644 --- a/aws/data_source_aws_cloudformation_export_test.go +++ b/aws/data_source_aws_cloudformation_export_test.go @@ -17,7 +17,7 @@ func TestAccAWSCloudformationExportDataSource_basic(t *testing.T) { Providers: testAccProviders, Steps: []resource.TestStep{ { - Config: testAccCheckAwsCloudformationExportConfig(rName), + Config: testAccCheckAwsCloudformationExportConfig(rName), PreventPostDestroyRefresh: true, Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttr("data.aws_cloudformation_export.waiter", "value", "waiter"), diff --git a/aws/opsworks_layers.go b/aws/opsworks_layers.go index 83e0b2d0284..d33eab61ca2 100644 --- a/aws/opsworks_layers.go +++ b/aws/opsworks_layers.go @@ -345,13 +345,13 @@ func (lt *opsworksLayerType) Create(d *schema.ResourceData, client *opsworks.Ops EnableAutoHealing: aws.Bool(d.Get("auto_healing").(bool)), InstallUpdatesOnBoot: aws.Bool(d.Get("install_updates_on_boot").(bool)), LifecycleEventConfiguration: lt.LifecycleEventConfiguration(d), - Name: aws.String(d.Get("name").(string)), - Packages: expandStringSet(d.Get("system_packages").(*schema.Set)), - Type: aws.String(lt.TypeName), - StackId: aws.String(d.Get("stack_id").(string)), - UseEbsOptimizedInstances: aws.Bool(d.Get("use_ebs_optimized_instances").(bool)), - Attributes: lt.AttributeMap(d), - VolumeConfigurations: lt.VolumeConfigurations(d), + Name: aws.String(d.Get("name").(string)), + Packages: expandStringSet(d.Get("system_packages").(*schema.Set)), + Type: aws.String(lt.TypeName), + StackId: aws.String(d.Get("stack_id").(string)), + UseEbsOptimizedInstances: aws.Bool(d.Get("use_ebs_optimized_instances").(bool)), + Attributes: lt.AttributeMap(d), + VolumeConfigurations: lt.VolumeConfigurations(d), } if lt.CustomShortName { @@ -399,11 +399,11 @@ func (lt *opsworksLayerType) Update(d *schema.ResourceData, client *opsworks.Ops EnableAutoHealing: aws.Bool(d.Get("auto_healing").(bool)), InstallUpdatesOnBoot: aws.Bool(d.Get("install_updates_on_boot").(bool)), LifecycleEventConfiguration: lt.LifecycleEventConfiguration(d), - Name: aws.String(d.Get("name").(string)), - Packages: expandStringSet(d.Get("system_packages").(*schema.Set)), - UseEbsOptimizedInstances: aws.Bool(d.Get("use_ebs_optimized_instances").(bool)), - Attributes: lt.AttributeMap(d), - VolumeConfigurations: lt.VolumeConfigurations(d), + Name: aws.String(d.Get("name").(string)), + Packages: expandStringSet(d.Get("system_packages").(*schema.Set)), + UseEbsOptimizedInstances: aws.Bool(d.Get("use_ebs_optimized_instances").(bool)), + Attributes: lt.AttributeMap(d), + VolumeConfigurations: lt.VolumeConfigurations(d), } if lt.CustomShortName { diff --git a/aws/resource_aws_acmpca_certificate_authority.go b/aws/resource_aws_acmpca_certificate_authority.go index e8158743c68..81bc3479f41 100644 --- a/aws/resource_aws_acmpca_certificate_authority.go +++ b/aws/resource_aws_acmpca_certificate_authority.go @@ -284,7 +284,7 @@ func resourceAwsAcmpcaCertificateAuthorityCreate(d *schema.ResourceData, meta in if v, ok := d.GetOk("tags"); ok { input := &acmpca.TagCertificateAuthorityInput{ CertificateAuthorityArn: aws.String(d.Id()), - Tags: tagsFromMapACMPCA(v.(map[string]interface{})), + Tags: tagsFromMapACMPCA(v.(map[string]interface{})), } log.Printf("[DEBUG] Tagging ACMPCA Certificate Authority: %s", input) @@ -458,7 +458,7 @@ func resourceAwsAcmpcaCertificateAuthorityUpdate(d *schema.ResourceData, meta in log.Printf("[DEBUG] Removing ACMPCA Certificate Authority %q tags: %#v", d.Id(), remove) _, err := conn.UntagCertificateAuthority(&acmpca.UntagCertificateAuthorityInput{ CertificateAuthorityArn: aws.String(d.Id()), - Tags: remove, + Tags: remove, }) if err != nil { return fmt.Errorf("error updating ACMPCA Certificate Authority %q tags: %s", d.Id(), err) @@ -468,7 +468,7 @@ func resourceAwsAcmpcaCertificateAuthorityUpdate(d *schema.ResourceData, meta in log.Printf("[DEBUG] Creating ACMPCA Certificate Authority %q tags: %#v", d.Id(), create) _, err := conn.TagCertificateAuthority(&acmpca.TagCertificateAuthorityInput{ CertificateAuthorityArn: aws.String(d.Id()), - Tags: create, + Tags: create, }) if err != nil { return fmt.Errorf("error updating ACMPCA Certificate Authority %q tags: %s", d.Id(), err) diff --git a/aws/resource_aws_api_gateway_integration.go b/aws/resource_aws_api_gateway_integration.go index 259d5d69136..755bcb54c09 100644 --- a/aws/resource_aws_api_gateway_integration.go +++ b/aws/resource_aws_api_gateway_integration.go @@ -243,22 +243,22 @@ func resourceAwsApiGatewayIntegrationCreate(d *schema.ResourceData, meta interfa } _, err := conn.PutIntegration(&apigateway.PutIntegrationInput{ - HttpMethod: aws.String(d.Get("http_method").(string)), - ResourceId: aws.String(d.Get("resource_id").(string)), - RestApiId: aws.String(d.Get("rest_api_id").(string)), - Type: aws.String(d.Get("type").(string)), + HttpMethod: aws.String(d.Get("http_method").(string)), + ResourceId: aws.String(d.Get("resource_id").(string)), + RestApiId: aws.String(d.Get("rest_api_id").(string)), + Type: aws.String(d.Get("type").(string)), IntegrationHttpMethod: integrationHttpMethod, - Uri: uri, - RequestParameters: aws.StringMap(parameters), - RequestTemplates: aws.StringMap(templates), - Credentials: credentials, - CacheNamespace: cacheNamespace, - CacheKeyParameters: cacheKeyParameters, - PassthroughBehavior: passthroughBehavior, - ContentHandling: contentHandling, - ConnectionType: connectionType, - ConnectionId: connectionId, - TimeoutInMillis: timeoutInMillis, + Uri: uri, + RequestParameters: aws.StringMap(parameters), + RequestTemplates: aws.StringMap(templates), + Credentials: credentials, + CacheNamespace: cacheNamespace, + CacheKeyParameters: cacheKeyParameters, + PassthroughBehavior: passthroughBehavior, + ContentHandling: contentHandling, + ConnectionType: connectionType, + ConnectionId: connectionId, + TimeoutInMillis: timeoutInMillis, }) if err != nil { return fmt.Errorf("Error creating API Gateway Integration: %s", err) diff --git a/aws/resource_aws_cloudfront_origin_access_identity.go b/aws/resource_aws_cloudfront_origin_access_identity.go index b82296763a9..00f6b65877b 100644 --- a/aws/resource_aws_cloudfront_origin_access_identity.go +++ b/aws/resource_aws_cloudfront_origin_access_identity.go @@ -95,9 +95,9 @@ func resourceAwsCloudFrontOriginAccessIdentityRead(d *schema.ResourceData, meta func resourceAwsCloudFrontOriginAccessIdentityUpdate(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).cloudfrontconn params := &cloudfront.UpdateCloudFrontOriginAccessIdentityInput{ - Id: aws.String(d.Id()), + Id: aws.String(d.Id()), CloudFrontOriginAccessIdentityConfig: expandOriginAccessIdentityConfig(d), - IfMatch: aws.String(d.Get("etag").(string)), + IfMatch: aws.String(d.Get("etag").(string)), } _, err := conn.UpdateCloudFrontOriginAccessIdentity(params) if err != nil { diff --git a/aws/resource_aws_codedeploy_deployment_group_test.go b/aws/resource_aws_codedeploy_deployment_group_test.go index 9f107231c5e..1ab89775d09 100644 --- a/aws/resource_aws_codedeploy_deployment_group_test.go +++ b/aws/resource_aws_codedeploy_deployment_group_test.go @@ -1568,7 +1568,7 @@ func TestAWSCodeDeployDeploymentGroup_expandBlueGreenDeploymentConfig(t *testing "terminate_blue_instances_on_deployment_success": []interface{}{ map[string]interface{}{ - "action": "TERMINATE", + "action": "TERMINATE", "termination_wait_time_in_minutes": 90, }, }, @@ -1586,7 +1586,7 @@ func TestAWSCodeDeployDeploymentGroup_expandBlueGreenDeploymentConfig(t *testing }, TerminateBlueInstancesOnDeploymentSuccess: &codedeploy.BlueInstanceTerminationOption{ - Action: aws.String("TERMINATE"), + Action: aws.String("TERMINATE"), TerminationWaitTimeInMinutes: aws.Int64(90), }, } @@ -1611,7 +1611,7 @@ func TestAWSCodeDeployDeploymentGroup_flattenBlueGreenDeploymentConfig(t *testin }, TerminateBlueInstancesOnDeploymentSuccess: &codedeploy.BlueInstanceTerminationOption{ - Action: aws.String("KEEP_ALIVE"), + Action: aws.String("KEEP_ALIVE"), TerminationWaitTimeInMinutes: aws.Int64(90), }, } @@ -1632,7 +1632,7 @@ func TestAWSCodeDeployDeploymentGroup_flattenBlueGreenDeploymentConfig(t *testin "terminate_blue_instances_on_deployment_success": []map[string]interface{}{ { - "action": "KEEP_ALIVE", + "action": "KEEP_ALIVE", "termination_wait_time_in_minutes": 90, }, }, diff --git a/aws/resource_aws_db_instance.go b/aws/resource_aws_db_instance.go index 9100d9518dd..8e44d8703c3 100644 --- a/aws/resource_aws_db_instance.go +++ b/aws/resource_aws_db_instance.go @@ -460,7 +460,7 @@ func resourceAwsDbInstanceCreate(d *schema.ResourceData, meta interface{}) error DBInstanceIdentifier: aws.String(identifier), PubliclyAccessible: aws.Bool(d.Get("publicly_accessible").(bool)), SourceDBInstanceIdentifier: aws.String(v.(string)), - Tags: tags, + Tags: tags, } if attr, ok := d.GetOk("allocated_storage"); ok { diff --git a/aws/resource_aws_db_security_group.go b/aws/resource_aws_db_security_group.go index 04d4ef1f9f8..f3bd2617c2f 100644 --- a/aws/resource_aws_db_security_group.go +++ b/aws/resource_aws_db_security_group.go @@ -91,7 +91,7 @@ func resourceAwsDbSecurityGroupCreate(d *schema.ResourceData, meta interface{}) opts := rds.CreateDBSecurityGroupInput{ DBSecurityGroupName: aws.String(d.Get("name").(string)), DBSecurityGroupDescription: aws.String(d.Get("description").(string)), - Tags: tags, + Tags: tags, } log.Printf("[DEBUG] DB Security Group create configuration: %#v", opts) diff --git a/aws/resource_aws_dms_replication_instance.go b/aws/resource_aws_dms_replication_instance.go index 282451a7b0e..df12efb91d6 100644 --- a/aws/resource_aws_dms_replication_instance.go +++ b/aws/resource_aws_dms_replication_instance.go @@ -136,7 +136,7 @@ func resourceAwsDmsReplicationInstanceCreate(d *schema.ResourceData, meta interf PubliclyAccessible: aws.Bool(d.Get("publicly_accessible").(bool)), ReplicationInstanceClass: aws.String(d.Get("replication_instance_class").(string)), ReplicationInstanceIdentifier: aws.String(d.Get("replication_instance_id").(string)), - Tags: dmsTagsFromMap(d.Get("tags").(map[string]interface{})), + Tags: dmsTagsFromMap(d.Get("tags").(map[string]interface{})), } // WARNING: GetOk returns the zero value for the type if the key is omitted in config. This means for optional diff --git a/aws/resource_aws_elasticache_replication_group_migrate_test.go b/aws/resource_aws_elasticache_replication_group_migrate_test.go index c014f7e6d68..1379d539a47 100644 --- a/aws/resource_aws_elasticache_replication_group_migrate_test.go +++ b/aws/resource_aws_elasticache_replication_group_migrate_test.go @@ -16,7 +16,7 @@ func TestAwsElasticacheReplicationGroupMigrateState(t *testing.T) { "v0Tov1": { StateVersion: 0, Attributes: map[string]string{ - "cluster_mode.#": "1", + "cluster_mode.#": "1", "cluster_mode.4170186206.num_node_groups": "2", "cluster_mode.4170186206.replicas_per_node_group": "1", }, diff --git a/aws/resource_aws_emr_security_configuration.go b/aws/resource_aws_emr_security_configuration.go index ff25619a361..45beffc6d1a 100644 --- a/aws/resource_aws_emr_security_configuration.go +++ b/aws/resource_aws_emr_security_configuration.go @@ -65,7 +65,7 @@ func resourceAwsEmrSecurityConfigurationCreate(d *schema.ResourceData, meta inte } resp, err := conn.CreateSecurityConfiguration(&emr.CreateSecurityConfigurationInput{ - Name: aws.String(emrSCName), + Name: aws.String(emrSCName), SecurityConfiguration: aws.String(d.Get("configuration").(string)), }) diff --git a/aws/resource_aws_gamelift_fleet.go b/aws/resource_aws_gamelift_fleet.go index 815b899d716..be1a328daab 100644 --- a/aws/resource_aws_gamelift_fleet.go +++ b/aws/resource_aws_gamelift_fleet.go @@ -301,10 +301,10 @@ func resourceAwsGameliftFleetUpdate(d *schema.ResourceData, meta interface{}) er if d.HasChange("description") || d.HasChange("metric_groups") || d.HasChange("name") || d.HasChange("new_game_session_protection_policy") || d.HasChange("resource_creation_limit_policy") { _, err := conn.UpdateFleetAttributes(&gamelift.UpdateFleetAttributesInput{ - Description: aws.String(d.Get("description").(string)), - FleetId: aws.String(d.Id()), - MetricGroups: expandStringList(d.Get("metric_groups").([]interface{})), - Name: aws.String(d.Get("name").(string)), + Description: aws.String(d.Get("description").(string)), + FleetId: aws.String(d.Id()), + MetricGroups: expandStringList(d.Get("metric_groups").([]interface{})), + Name: aws.String(d.Get("name").(string)), NewGameSessionProtectionPolicy: aws.String(d.Get("new_game_session_protection_policy").(string)), ResourceCreationLimitPolicy: expandGameliftResourceCreationLimitPolicy(d.Get("resource_creation_limit_policy").([]interface{})), }) @@ -318,7 +318,7 @@ func resourceAwsGameliftFleetUpdate(d *schema.ResourceData, meta interface{}) er authorizations, revocations := diffGameliftPortSettings(oldPerms.([]interface{}), newPerms.([]interface{})) _, err := conn.UpdateFleetPortSettings(&gamelift.UpdateFleetPortSettingsInput{ - FleetId: aws.String(d.Id()), + FleetId: aws.String(d.Id()), InboundPermissionAuthorizations: authorizations, InboundPermissionRevocations: revocations, }) diff --git a/aws/resource_aws_instance.go b/aws/resource_aws_instance.go index 65637d7a05c..a51ad8f461c 100644 --- a/aws/resource_aws_instance.go +++ b/aws/resource_aws_instance.go @@ -505,12 +505,12 @@ func resourceAwsInstanceCreate(d *schema.ResourceData, meta interface{}) error { // Build the creation struct runOpts := &ec2.RunInstancesInput{ - BlockDeviceMappings: instanceOpts.BlockDeviceMappings, - DisableApiTermination: instanceOpts.DisableAPITermination, - EbsOptimized: instanceOpts.EBSOptimized, - Monitoring: instanceOpts.Monitoring, - IamInstanceProfile: instanceOpts.IAMInstanceProfile, - ImageId: instanceOpts.ImageID, + BlockDeviceMappings: instanceOpts.BlockDeviceMappings, + DisableApiTermination: instanceOpts.DisableAPITermination, + EbsOptimized: instanceOpts.EBSOptimized, + Monitoring: instanceOpts.Monitoring, + IamInstanceProfile: instanceOpts.IAMInstanceProfile, + ImageId: instanceOpts.ImageID, InstanceInitiatedShutdownBehavior: instanceOpts.InstanceInitiatedShutdownBehavior, InstanceType: instanceOpts.InstanceType, Ipv6AddressCount: instanceOpts.Ipv6AddressCount, diff --git a/aws/resource_aws_instance_migrate_test.go b/aws/resource_aws_instance_migrate_test.go index bc591fd092a..d392943315e 100644 --- a/aws/resource_aws_instance_migrate_test.go +++ b/aws/resource_aws_instance_migrate_test.go @@ -17,7 +17,7 @@ func TestAWSInstanceMigrateState(t *testing.T) { StateVersion: 0, Attributes: map[string]string{ // EBS - "block_device.#": "2", + "block_device.#": "2", "block_device.3851383343.delete_on_termination": "true", "block_device.3851383343.device_name": "/dev/sdx", "block_device.3851383343.encrypted": "false", @@ -42,7 +42,7 @@ func TestAWSInstanceMigrateState(t *testing.T) { "block_device.56575650.volume_type": "standard", }, Expected: map[string]string{ - "ebs_block_device.#": "1", + "ebs_block_device.#": "1", "ebs_block_device.3851383343.delete_on_termination": "true", "ebs_block_device.3851383343.device_name": "/dev/sdx", "ebs_block_device.3851383343.encrypted": "false", @@ -64,7 +64,7 @@ func TestAWSInstanceMigrateState(t *testing.T) { StateVersion: 0, Attributes: map[string]string{ // EBS - "block_device.#": "2", + "block_device.#": "2", "block_device.3851383343.delete_on_termination": "true", "block_device.3851383343.device_name": "/dev/sdx", "block_device.3851383343.encrypted": "false", @@ -92,7 +92,7 @@ func TestAWSInstanceMigrateState(t *testing.T) { "root_block_device.3018388612.iops": "1000", }, Expected: map[string]string{ - "ebs_block_device.#": "1", + "ebs_block_device.#": "1", "ebs_block_device.3851383343.delete_on_termination": "true", "ebs_block_device.3851383343.device_name": "/dev/sdx", "ebs_block_device.3851383343.encrypted": "false", diff --git a/aws/resource_aws_kinesis_firehose_delivery_stream.go b/aws/resource_aws_kinesis_firehose_delivery_stream.go index d570bb62b60..74dedf576b2 100644 --- a/aws/resource_aws_kinesis_firehose_delivery_stream.go +++ b/aws/resource_aws_kinesis_firehose_delivery_stream.go @@ -228,11 +228,11 @@ func flattenFirehoseExtendedS3Configuration(description *firehose.ExtendedS3Dest "cloudwatch_logging_options": flattenCloudwatchLoggingOptions(description.CloudWatchLoggingOptions), "compression_format": aws.StringValue(description.CompressionFormat), "data_format_conversion_configuration": flattenFirehoseDataFormatConversionConfiguration(description.DataFormatConversionConfiguration), - "prefix": aws.StringValue(description.Prefix), - "processing_configuration": flattenProcessingConfiguration(description.ProcessingConfiguration, aws.StringValue(description.RoleARN)), - "role_arn": aws.StringValue(description.RoleARN), - "s3_backup_configuration": flattenFirehoseS3Configuration(description.S3BackupDescription), - "s3_backup_mode": aws.StringValue(description.S3BackupMode), + "prefix": aws.StringValue(description.Prefix), + "processing_configuration": flattenProcessingConfiguration(description.ProcessingConfiguration, aws.StringValue(description.RoleARN)), + "role_arn": aws.StringValue(description.RoleARN), + "s3_backup_configuration": flattenFirehoseS3Configuration(description.S3BackupDescription), + "s3_backup_mode": aws.StringValue(description.S3BackupMode), } if description.BufferingHints != nil { diff --git a/aws/resource_aws_neptune_cluster_instance.go b/aws/resource_aws_neptune_cluster_instance.go index 6cb8ec42a41..026feeb7346 100644 --- a/aws/resource_aws_neptune_cluster_instance.go +++ b/aws/resource_aws_neptune_cluster_instance.go @@ -196,7 +196,7 @@ func resourceAwsNeptuneClusterInstanceCreate(d *schema.ResourceData, meta interf PubliclyAccessible: aws.Bool(d.Get("publicly_accessible").(bool)), PromotionTier: aws.Int64(int64(d.Get("promotion_tier").(int))), AutoMinorVersionUpgrade: aws.Bool(d.Get("auto_minor_version_upgrade").(bool)), - Tags: tags, + Tags: tags, } if attr, ok := d.GetOk("availability_zone"); ok { diff --git a/aws/resource_aws_neptune_cluster_parameter_group.go b/aws/resource_aws_neptune_cluster_parameter_group.go index 7a879889d5c..a04db20a2d5 100644 --- a/aws/resource_aws_neptune_cluster_parameter_group.go +++ b/aws/resource_aws_neptune_cluster_parameter_group.go @@ -154,7 +154,7 @@ func resourceAwsNeptuneClusterParameterGroupRead(d *schema.ResourceData, meta in // Only include user customized parameters as there's hundreds of system/default ones describeParametersOpts := neptune.DescribeDBClusterParametersInput{ DBClusterParameterGroupName: aws.String(d.Id()), - Source: aws.String("user"), + Source: aws.String("user"), } describeParametersResp, err := conn.DescribeDBClusterParameters(&describeParametersOpts) diff --git a/aws/resource_aws_rds_cluster_instance.go b/aws/resource_aws_rds_cluster_instance.go index 70ad3d3dafe..4a65db57786 100644 --- a/aws/resource_aws_rds_cluster_instance.go +++ b/aws/resource_aws_rds_cluster_instance.go @@ -216,7 +216,7 @@ func resourceAwsRDSClusterInstanceCreate(d *schema.ResourceData, meta interface{ PubliclyAccessible: aws.Bool(d.Get("publicly_accessible").(bool)), PromotionTier: aws.Int64(int64(d.Get("promotion_tier").(int))), AutoMinorVersionUpgrade: aws.Bool(d.Get("auto_minor_version_upgrade").(bool)), - Tags: tags, + Tags: tags, } if attr, ok := d.GetOk("availability_zone"); ok { diff --git a/aws/resource_aws_rds_cluster_parameter_group.go b/aws/resource_aws_rds_cluster_parameter_group.go index 577a5b6f4b3..c882de7660a 100644 --- a/aws/resource_aws_rds_cluster_parameter_group.go +++ b/aws/resource_aws_rds_cluster_parameter_group.go @@ -161,7 +161,7 @@ func resourceAwsRDSClusterParameterGroupRead(d *schema.ResourceData, meta interf // Only include user customized parameters as there's hundreds of system/default ones describeParametersOpts := rds.DescribeDBClusterParametersInput{ DBClusterParameterGroupName: aws.String(d.Id()), - Source: aws.String("user"), + Source: aws.String("user"), } describeParametersResp, err := rdsconn.DescribeDBClusterParameters(&describeParametersOpts) diff --git a/aws/resource_aws_redshift_cluster.go b/aws/resource_aws_redshift_cluster.go index 9f6c99ee3cf..6cde16cef90 100644 --- a/aws/resource_aws_redshift_cluster.go +++ b/aws/resource_aws_redshift_cluster.go @@ -415,7 +415,7 @@ func resourceAwsRedshiftClusterCreate(d *schema.ResourceData, meta interface{}) AllowVersionUpgrade: aws.Bool(d.Get("allow_version_upgrade").(bool)), PubliclyAccessible: aws.Bool(d.Get("publicly_accessible").(bool)), AutomatedSnapshotRetentionPeriod: aws.Int64(int64(d.Get("automated_snapshot_retention_period").(int))), - Tags: tags, + Tags: tags, } if v := d.Get("number_of_nodes").(int); v > 1 { diff --git a/aws/resource_aws_route53_record.go b/aws/resource_aws_route53_record.go index 92c10adb301..f0f6651065e 100644 --- a/aws/resource_aws_route53_record.go +++ b/aws/resource_aws_route53_record.go @@ -541,8 +541,8 @@ func resourceAwsRoute53RecordRead(d *schema.ResourceData, meta interface{}) erro name := normalizeAwsAliasName(*alias.DNSName) d.Set("alias", []interface{}{ map[string]interface{}{ - "zone_id": *alias.HostedZoneId, - "name": name, + "zone_id": *alias.HostedZoneId, + "name": name, "evaluate_target_health": *alias.EvaluateTargetHealth, }, }) diff --git a/aws/resource_aws_s3_bucket.go b/aws/resource_aws_s3_bucket.go index e304cd614ed..c935ddb2258 100644 --- a/aws/resource_aws_s3_bucket.go +++ b/aws/resource_aws_s3_bucket.go @@ -1700,7 +1700,7 @@ func resourceAwsS3BucketServerSideEncryptionConfigurationUpdate(s3conn *s3.S3, d rc.Rules = rules i := &s3.PutBucketEncryptionInput{ - Bucket: aws.String(bucket), + Bucket: aws.String(bucket), ServerSideEncryptionConfiguration: rc, } log.Printf("[DEBUG] S3 put bucket replication configuration: %#v", i) @@ -1807,7 +1807,7 @@ func resourceAwsS3BucketReplicationConfigurationUpdate(s3conn *s3.S3, d *schema. rc.Rules = rules i := &s3.PutBucketReplicationInput{ - Bucket: aws.String(bucket), + Bucket: aws.String(bucket), ReplicationConfiguration: rc, } log.Printf("[DEBUG] S3 put bucket replication configuration: %#v", i) diff --git a/aws/resource_aws_s3_bucket_inventory.go b/aws/resource_aws_s3_bucket_inventory.go index 71b8f7eb0d8..43a0498fb0c 100644 --- a/aws/resource_aws_s3_bucket_inventory.go +++ b/aws/resource_aws_s3_bucket_inventory.go @@ -221,8 +221,8 @@ func resourceAwsS3BucketInventoryPut(d *schema.ResourceData, meta interface{}) e } input := &s3.PutBucketInventoryConfigurationInput{ - Bucket: aws.String(bucket), - Id: aws.String(name), + Bucket: aws.String(bucket), + Id: aws.String(name), InventoryConfiguration: inventoryConfiguration, } diff --git a/aws/resource_aws_s3_bucket_notification.go b/aws/resource_aws_s3_bucket_notification.go index 4e313b6e833..ba03a393754 100644 --- a/aws/resource_aws_s3_bucket_notification.go +++ b/aws/resource_aws_s3_bucket_notification.go @@ -304,7 +304,7 @@ func resourceAwsS3BucketNotificationPut(d *schema.ResourceData, meta interface{} notificationConfiguration.TopicConfigurations = topicConfigs } i := &s3.PutBucketNotificationConfigurationInput{ - Bucket: aws.String(bucket), + Bucket: aws.String(bucket), NotificationConfiguration: notificationConfiguration, } @@ -336,7 +336,7 @@ func resourceAwsS3BucketNotificationDelete(d *schema.ResourceData, meta interfac s3conn := meta.(*AWSClient).s3conn i := &s3.PutBucketNotificationConfigurationInput{ - Bucket: aws.String(d.Id()), + Bucket: aws.String(d.Id()), NotificationConfiguration: &s3.NotificationConfiguration{}, } diff --git a/aws/resource_aws_security_group_migrate_test.go b/aws/resource_aws_security_group_migrate_test.go index e990ef3e1f1..3b14edb0e5e 100644 --- a/aws/resource_aws_security_group_migrate_test.go +++ b/aws/resource_aws_security_group_migrate_test.go @@ -19,7 +19,7 @@ func TestAWSSecurityGroupMigrateState(t *testing.T) { "name": "test", }, Expected: map[string]string{ - "name": "test", + "name": "test", "revoke_rules_on_delete": "false", }, }, diff --git a/aws/resource_aws_service_discovery_service_migrate_test.go b/aws/resource_aws_service_discovery_service_migrate_test.go index ddd24a8f46b..8a36485b451 100644 --- a/aws/resource_aws_service_discovery_service_migrate_test.go +++ b/aws/resource_aws_service_discovery_service_migrate_test.go @@ -24,7 +24,7 @@ func TestAwsServiceDiscoveryServiceMigrateState(t *testing.T) { "dns_config.0.dns_records.#": "1", "dns_config.0.dns_records.0.ttl": "10", "dns_config.0.dns_records.0.type": "A", - "arn": "arn", + "arn": "arn", }, Expected: map[string]string{ "name": "test-name", @@ -34,7 +34,7 @@ func TestAwsServiceDiscoveryServiceMigrateState(t *testing.T) { "dns_config.0.dns_records.#": "1", "dns_config.0.dns_records.0.ttl": "10", "dns_config.0.dns_records.0.type": "A", - "arn": "arn", + "arn": "arn", }, }, } diff --git a/aws/resource_aws_sns_topic.go b/aws/resource_aws_sns_topic.go index be5d2bfcc8e..519aa4698f2 100644 --- a/aws/resource_aws_sns_topic.go +++ b/aws/resource_aws_sns_topic.go @@ -27,10 +27,10 @@ var SNSAttributeMap = map[string]string{ "lambda_failure_feedback_role_arn": "LambdaFailureFeedbackRoleArn", "lambda_success_feedback_role_arn": "LambdaSuccessFeedbackRoleArn", "lambda_success_feedback_sample_rate": "LambdaSuccessFeedbackSampleRate", - "policy": "Policy", - "sqs_failure_feedback_role_arn": "SQSFailureFeedbackRoleArn", - "sqs_success_feedback_role_arn": "SQSSuccessFeedbackRoleArn", - "sqs_success_feedback_sample_rate": "SQSSuccessFeedbackSampleRate", + "policy": "Policy", + "sqs_failure_feedback_role_arn": "SQSFailureFeedbackRoleArn", + "sqs_success_feedback_role_arn": "SQSSuccessFeedbackRoleArn", + "sqs_success_feedback_sample_rate": "SQSSuccessFeedbackSampleRate", } func resourceAwsSnsTopic() *schema.Resource { diff --git a/aws/resource_aws_spot_fleet_request.go b/aws/resource_aws_spot_fleet_request.go index 15fcb4c01ed..d794d09c508 100644 --- a/aws/resource_aws_spot_fleet_request.go +++ b/aws/resource_aws_spot_fleet_request.go @@ -610,7 +610,7 @@ func resourceAwsSpotFleetRequestCreate(d *schema.ResourceData, meta interface{}) TerminateInstancesWithExpiration: aws.Bool(d.Get("terminate_instances_with_expiration").(bool)), ReplaceUnhealthyInstances: aws.Bool(d.Get("replace_unhealthy_instances").(bool)), InstanceInterruptionBehavior: aws.String(d.Get("instance_interruption_behaviour").(string)), - Type: aws.String(d.Get("fleet_type").(string)), + Type: aws.String(d.Get("fleet_type").(string)), } if v, ok := d.GetOk("excess_capacity_termination_policy"); ok { diff --git a/aws/resource_aws_spot_instance_request.go b/aws/resource_aws_spot_instance_request.go index 5460b0790cc..5a0dbeabc84 100644 --- a/aws/resource_aws_spot_instance_request.go +++ b/aws/resource_aws_spot_instance_request.go @@ -118,8 +118,8 @@ func resourceAwsSpotInstanceRequestCreate(d *schema.ResourceData, meta interface } spotOpts := &ec2.RequestSpotInstancesInput{ - SpotPrice: aws.String(d.Get("spot_price").(string)), - Type: aws.String(d.Get("spot_type").(string)), + SpotPrice: aws.String(d.Get("spot_price").(string)), + Type: aws.String(d.Get("spot_type").(string)), InstanceInterruptionBehavior: aws.String(d.Get("instance_interruption_behaviour").(string)), // Though the AWS API supports creating spot instance requests for multiple diff --git a/aws/resource_aws_ssm_maintenance_window.go b/aws/resource_aws_ssm_maintenance_window.go index f9d55e8d039..a7c939cc747 100644 --- a/aws/resource_aws_ssm_maintenance_window.go +++ b/aws/resource_aws_ssm_maintenance_window.go @@ -55,10 +55,10 @@ func resourceAwsSsmMaintenanceWindowCreate(d *schema.ResourceData, meta interfac ssmconn := meta.(*AWSClient).ssmconn params := &ssm.CreateMaintenanceWindowInput{ - Name: aws.String(d.Get("name").(string)), - Schedule: aws.String(d.Get("schedule").(string)), - Duration: aws.Int64(int64(d.Get("duration").(int))), - Cutoff: aws.Int64(int64(d.Get("cutoff").(int))), + Name: aws.String(d.Get("name").(string)), + Schedule: aws.String(d.Get("schedule").(string)), + Duration: aws.Int64(int64(d.Get("duration").(int))), + Cutoff: aws.Int64(int64(d.Get("cutoff").(int))), AllowUnassociatedTargets: aws.Bool(d.Get("allow_unassociated_targets").(bool)), } diff --git a/aws/resource_aws_ssm_patch_baseline.go b/aws/resource_aws_ssm_patch_baseline.go index 7183190f2a9..c271c84ae40 100644 --- a/aws/resource_aws_ssm_patch_baseline.go +++ b/aws/resource_aws_ssm_patch_baseline.go @@ -147,7 +147,7 @@ func resourceAwsSsmPatchBaselineCreate(d *schema.ResourceData, meta interface{}) ssmconn := meta.(*AWSClient).ssmconn params := &ssm.CreatePatchBaselineInput{ - Name: aws.String(d.Get("name").(string)), + Name: aws.String(d.Get("name").(string)), ApprovedPatchesComplianceLevel: aws.String(d.Get("approved_patches_compliance_level").(string)), OperatingSystem: aws.String(d.Get("operating_system").(string)), } diff --git a/aws/resource_aws_swf_domain.go b/aws/resource_aws_swf_domain.go index 8668ec108fd..5e254496611 100644 --- a/aws/resource_aws_swf_domain.go +++ b/aws/resource_aws_swf_domain.go @@ -70,7 +70,7 @@ func resourceAwsSwfDomainCreate(d *schema.ResourceData, meta interface{}) error } input := &swf.RegisterDomainInput{ - Name: aws.String(name), + Name: aws.String(name), WorkflowExecutionRetentionPeriodInDays: aws.String(d.Get("workflow_execution_retention_period_in_days").(string)), } diff --git a/aws/resource_aws_vpc.go b/aws/resource_aws_vpc.go index f6f0b4dff7c..73a9defe488 100644 --- a/aws/resource_aws_vpc.go +++ b/aws/resource_aws_vpc.go @@ -411,7 +411,7 @@ func resourceAwsVpcUpdate(d *schema.ResourceData, meta interface{}) error { if toAssign { modifyOpts := &ec2.AssociateVpcCidrBlockInput{ - VpcId: &vpcid, + VpcId: &vpcid, AmazonProvidedIpv6CidrBlock: aws.Bool(toAssign), } log.Printf("[INFO] Enabling assign_generated_ipv6_cidr_block vpc attribute for %s: %#v", diff --git a/aws/validators_test.go b/aws/validators_test.go index df9fed35db5..3f11fbc8807 100644 --- a/aws/validators_test.go +++ b/aws/validators_test.go @@ -1563,6 +1563,66 @@ func TestValidateElbNamePrefix(t *testing.T) { } } +func TestValidateNeptuneEventSubscriptionName(t *testing.T) { + cases := []struct { + Value string + ErrCount int + }{ + { + Value: "testing123!", + ErrCount: 1, + }, + { + Value: "testing 123", + ErrCount: 1, + }, + { + Value: "testing_123", + ErrCount: 1, + }, + { + Value: randomString(256), + ErrCount: 1, + }, + } + for _, tc := range cases { + _, errors := validateNeptuneEventSubscriptionName(tc.Value, "aws_neptune_event_subscription") + if len(errors) != tc.ErrCount { + t.Fatalf("Expected the Neptune Event Subscription Name to trigger a validation error for %q", tc.Value) + } + } +} + +func TestValidateNeptuneEventSubscriptionNamePrefix(t *testing.T) { + cases := []struct { + Value string + ErrCount int + }{ + { + Value: "testing123!", + ErrCount: 1, + }, + { + Value: "testing 123", + ErrCount: 1, + }, + { + Value: "testing_123", + ErrCount: 1, + }, + { + Value: randomString(254), + ErrCount: 1, + }, + } + for _, tc := range cases { + _, errors := validateNeptuneEventSubscriptionNamePrefix(tc.Value, "aws_neptune_event_subscription") + if len(errors) != tc.ErrCount { + t.Fatalf("Expected the Neptune Event Subscription Name Prefix to trigger a validation error for %q", tc.Value) + } + } +} + func TestValidateDbSubnetGroupName(t *testing.T) { cases := []struct { Value string @@ -2280,23 +2340,23 @@ func TestValidateCognitoRoleMappingsAmbiguousRoleResolutionAgainstType(t *testin }{ { AmbiguousRoleResolution: nil, - Type: cognitoidentity.RoleMappingTypeToken, - ErrCount: 1, + Type: cognitoidentity.RoleMappingTypeToken, + ErrCount: 1, }, { AmbiguousRoleResolution: "foo", - Type: cognitoidentity.RoleMappingTypeToken, - ErrCount: 0, // 0 as it should be defined, the value isn't validated here + Type: cognitoidentity.RoleMappingTypeToken, + ErrCount: 0, // 0 as it should be defined, the value isn't validated here }, { AmbiguousRoleResolution: cognitoidentity.AmbiguousRoleResolutionTypeAuthenticatedRole, - Type: cognitoidentity.RoleMappingTypeToken, - ErrCount: 0, + Type: cognitoidentity.RoleMappingTypeToken, + ErrCount: 0, }, { AmbiguousRoleResolution: cognitoidentity.AmbiguousRoleResolutionTypeDeny, - Type: cognitoidentity.RoleMappingTypeToken, - ErrCount: 0, + Type: cognitoidentity.RoleMappingTypeToken, + ErrCount: 0, }, } From df74055e07548a249394ec008d6a014525691bb5 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Fri, 31 Aug 2018 18:54:48 -0400 Subject: [PATCH 035/184] vendor: aws/aws-sdk-go@v1.15.26 * Updated via `govendor fetch github.com/aws/aws-sdk-go/...@v1.15.26` --- .../aws/aws-sdk-go/aws/endpoints/defaults.go | 10 + .../github.com/aws/aws-sdk-go/aws/version.go | 2 +- .../aws/aws-sdk-go/service/codebuild/api.go | 298 +++++ .../aws/aws-sdk-go/service/eks/api.go | 35 +- .../aws/aws-sdk-go/service/eks/doc.go | 16 +- .../aws/aws-sdk-go/service/eks/errors.go | 6 +- .../aws/aws-sdk-go/service/iot/api.go | 456 ++++++-- .../aws-sdk-go/service/mediapackage/api.go | 203 +++- .../aws/aws-sdk-go/service/redshift/api.go | 22 +- .../aws/aws-sdk-go/service/sagemaker/api.go | 25 +- .../aws/aws-sdk-go/service/waf/api.go | 954 +++++++++++++-- .../aws/aws-sdk-go/service/waf/errors.go | 8 +- .../aws/aws-sdk-go/service/wafregional/api.go | 475 +++++++- .../aws-sdk-go/service/wafregional/errors.go | 8 +- vendor/vendor.json | 1038 ++++++++--------- 15 files changed, 2758 insertions(+), 798 deletions(-) diff --git a/vendor/github.com/aws/aws-sdk-go/aws/endpoints/defaults.go b/vendor/github.com/aws/aws-sdk-go/aws/endpoints/defaults.go index ebce035cfdd..86788100adc 100644 --- a/vendor/github.com/aws/aws-sdk-go/aws/endpoints/defaults.go +++ b/vendor/github.com/aws/aws-sdk-go/aws/endpoints/defaults.go @@ -113,6 +113,7 @@ const ( ImportexportServiceID = "importexport" // Importexport. InspectorServiceID = "inspector" // Inspector. IotServiceID = "iot" // Iot. + IotanalyticsServiceID = "iotanalytics" // Iotanalytics. KinesisServiceID = "kinesis" // Kinesis. KinesisanalyticsServiceID = "kinesisanalytics" // Kinesisanalytics. KinesisvideoServiceID = "kinesisvideo" // Kinesisvideo. @@ -1409,6 +1410,15 @@ var awsPartition = partition{ "us-west-2": endpoint{}, }, }, + "iotanalytics": service{ + + Endpoints: endpoints{ + "eu-west-1": endpoint{}, + "us-east-1": endpoint{}, + "us-east-2": endpoint{}, + "us-west-2": endpoint{}, + }, + }, "kinesis": service{ Endpoints: endpoints{ diff --git a/vendor/github.com/aws/aws-sdk-go/aws/version.go b/vendor/github.com/aws/aws-sdk-go/aws/version.go index f44b55400cf..844aa4d26f0 100644 --- a/vendor/github.com/aws/aws-sdk-go/aws/version.go +++ b/vendor/github.com/aws/aws-sdk-go/aws/version.go @@ -5,4 +5,4 @@ package aws const SDKName = "aws-sdk-go" // SDKVersion is the version of this SDK -const SDKVersion = "1.15.21" +const SDKVersion = "1.15.26" diff --git a/vendor/github.com/aws/aws-sdk-go/service/codebuild/api.go b/vendor/github.com/aws/aws-sdk-go/service/codebuild/api.go index 52824177a7b..41ad39eeb7c 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/codebuild/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/codebuild/api.go @@ -1626,6 +1626,33 @@ type Build struct { // The name of the AWS CodeBuild project. ProjectName *string `locationName:"projectName" min:"1" type:"string"` + // An array of ProjectArtifacts objects. + SecondaryArtifacts []*BuildArtifacts `locationName:"secondaryArtifacts" type:"list"` + + // An array of ProjectSourceVersion objects. Each ProjectSourceVersion must + // be one of: + // + // * For AWS CodeCommit: the commit ID to use. + // + // * For GitHub: the commit ID, pull request ID, branch name, or tag name + // that corresponds to the version of the source code you want to build. + // If a pull request ID is specified, it must use the format pr/pull-request-ID + // (for example pr/25). If a branch name is specified, the branch's HEAD + // commit ID will be used. If not specified, the default branch's HEAD commit + // ID will be used. + // + // * For Bitbucket: the commit ID, branch name, or tag name that corresponds + // to the version of the source code you want to build. If a branch name + // is specified, the branch's HEAD commit ID will be used. If not specified, + // the default branch's HEAD commit ID will be used. + // + // * For Amazon Simple Storage Service (Amazon S3): the version ID of the + // object representing the build input ZIP file to use. + SecondarySourceVersions []*ProjectSourceVersion `locationName:"secondarySourceVersions" type:"list"` + + // An array of ProjectSource objects. + SecondarySources []*ProjectSource `locationName:"secondarySources" type:"list"` + // The name of a service role used for this build. ServiceRole *string `locationName:"serviceRole" min:"1" type:"string"` @@ -1749,6 +1776,24 @@ func (s *Build) SetProjectName(v string) *Build { return s } +// SetSecondaryArtifacts sets the SecondaryArtifacts field's value. +func (s *Build) SetSecondaryArtifacts(v []*BuildArtifacts) *Build { + s.SecondaryArtifacts = v + return s +} + +// SetSecondarySourceVersions sets the SecondarySourceVersions field's value. +func (s *Build) SetSecondarySourceVersions(v []*ProjectSourceVersion) *Build { + s.SecondarySourceVersions = v + return s +} + +// SetSecondarySources sets the SecondarySources field's value. +func (s *Build) SetSecondarySources(v []*ProjectSource) *Build { + s.SecondarySources = v + return s +} + // SetServiceRole sets the ServiceRole field's value. func (s *Build) SetServiceRole(v string) *Build { s.ServiceRole = &v @@ -1789,6 +1834,9 @@ func (s *Build) SetVpcConfig(v *VpcConfig) *Build { type BuildArtifacts struct { _ struct{} `type:"structure"` + // An identifier for this artifact definition. + ArtifactIdentifier *string `locationName:"artifactIdentifier" type:"string"` + // Information that tells you if encryption for build artifacts is disabled. EncryptionDisabled *bool `locationName:"encryptionDisabled" type:"boolean"` @@ -1830,6 +1878,12 @@ func (s BuildArtifacts) GoString() string { return s.String() } +// SetArtifactIdentifier sets the ArtifactIdentifier field's value. +func (s *BuildArtifacts) SetArtifactIdentifier(v string) *BuildArtifacts { + s.ArtifactIdentifier = &v + return s +} + // SetEncryptionDisabled sets the EncryptionDisabled field's value. func (s *BuildArtifacts) SetEncryptionDisabled(v bool) *BuildArtifacts { s.EncryptionDisabled = &v @@ -2033,6 +2087,12 @@ type CreateProjectInput struct { // Name is a required field Name *string `locationName:"name" min:"2" type:"string" required:"true"` + // An array of ProjectArtifacts objects. + SecondaryArtifacts []*ProjectArtifacts `locationName:"secondaryArtifacts" type:"list"` + + // An array of ProjectSource objects. + SecondarySources []*ProjectSource `locationName:"secondarySources" type:"list"` + // The ARN of the AWS Identity and Access Management (IAM) role that enables // AWS CodeBuild to interact with dependent AWS services on behalf of the AWS // account. @@ -2115,6 +2175,26 @@ func (s *CreateProjectInput) Validate() error { invalidParams.AddNested("Environment", err.(request.ErrInvalidParams)) } } + if s.SecondaryArtifacts != nil { + for i, v := range s.SecondaryArtifacts { + if v == nil { + continue + } + if err := v.Validate(); err != nil { + invalidParams.AddNested(fmt.Sprintf("%s[%v]", "SecondaryArtifacts", i), err.(request.ErrInvalidParams)) + } + } + } + if s.SecondarySources != nil { + for i, v := range s.SecondarySources { + if v == nil { + continue + } + if err := v.Validate(); err != nil { + invalidParams.AddNested(fmt.Sprintf("%s[%v]", "SecondarySources", i), err.(request.ErrInvalidParams)) + } + } + } if s.Source != nil { if err := s.Source.Validate(); err != nil { invalidParams.AddNested("Source", err.(request.ErrInvalidParams)) @@ -2184,6 +2264,18 @@ func (s *CreateProjectInput) SetName(v string) *CreateProjectInput { return s } +// SetSecondaryArtifacts sets the SecondaryArtifacts field's value. +func (s *CreateProjectInput) SetSecondaryArtifacts(v []*ProjectArtifacts) *CreateProjectInput { + s.SecondaryArtifacts = v + return s +} + +// SetSecondarySources sets the SecondarySources field's value. +func (s *CreateProjectInput) SetSecondarySources(v []*ProjectSource) *CreateProjectInput { + s.SecondarySources = v + return s +} + // SetServiceRole sets the ServiceRole field's value. func (s *CreateProjectInput) SetServiceRole(v string) *CreateProjectInput { s.ServiceRole = &v @@ -3144,6 +3236,12 @@ type Project struct { // The name of the build project. Name *string `locationName:"name" min:"2" type:"string"` + // An array of ProjectArtifacts objects. + SecondaryArtifacts []*ProjectArtifacts `locationName:"secondaryArtifacts" type:"list"` + + // An array of ProjectSource objects. + SecondarySources []*ProjectSource `locationName:"secondarySources" type:"list"` + // The ARN of the AWS Identity and Access Management (IAM) role that enables // AWS CodeBuild to interact with dependent AWS services on behalf of the AWS // account. @@ -3241,6 +3339,18 @@ func (s *Project) SetName(v string) *Project { return s } +// SetSecondaryArtifacts sets the SecondaryArtifacts field's value. +func (s *Project) SetSecondaryArtifacts(v []*ProjectArtifacts) *Project { + s.SecondaryArtifacts = v + return s +} + +// SetSecondarySources sets the SecondarySources field's value. +func (s *Project) SetSecondarySources(v []*ProjectSource) *Project { + s.SecondarySources = v + return s +} + // SetServiceRole sets the ServiceRole field's value. func (s *Project) SetServiceRole(v string) *Project { s.ServiceRole = &v @@ -3281,6 +3391,9 @@ func (s *Project) SetWebhook(v *Webhook) *Project { type ProjectArtifacts struct { _ struct{} `type:"structure"` + // An identifier for this artifact definition. + ArtifactIdentifier *string `locationName:"artifactIdentifier" type:"string"` + // Set to true if you do not want your output artifacts encrypted. This option // is only valid if your artifacts type is Amazon S3. If this is set with another // artifacts type, an invalidInputException will be thrown. @@ -3427,6 +3540,12 @@ func (s *ProjectArtifacts) Validate() error { return nil } +// SetArtifactIdentifier sets the ArtifactIdentifier field's value. +func (s *ProjectArtifacts) SetArtifactIdentifier(v string) *ProjectArtifacts { + s.ArtifactIdentifier = &v + return s +} + // SetEncryptionDisabled sets the EncryptionDisabled field's value. func (s *ProjectArtifacts) SetEncryptionDisabled(v bool) *ProjectArtifacts { s.EncryptionDisabled = &v @@ -3774,6 +3893,9 @@ type ProjectSource struct { // is thrown. ReportBuildStatus *bool `locationName:"reportBuildStatus" type:"boolean"` + // An identifier for this project source. + SourceIdentifier *string `locationName:"sourceIdentifier" type:"string"` + // The type of repository that contains the source code to be built. Valid values // include: // @@ -3857,12 +3979,89 @@ func (s *ProjectSource) SetReportBuildStatus(v bool) *ProjectSource { return s } +// SetSourceIdentifier sets the SourceIdentifier field's value. +func (s *ProjectSource) SetSourceIdentifier(v string) *ProjectSource { + s.SourceIdentifier = &v + return s +} + // SetType sets the Type field's value. func (s *ProjectSource) SetType(v string) *ProjectSource { s.Type = &v return s } +// A source identifier and its corresponding version. +type ProjectSourceVersion struct { + _ struct{} `type:"structure"` + + // An identifier for a source in the build project. + // + // SourceIdentifier is a required field + SourceIdentifier *string `locationName:"sourceIdentifier" type:"string" required:"true"` + + // The source version for the corresponding source identifier. If specified, + // must be one of: + // + // * For AWS CodeCommit: the commit ID to use. + // + // * For GitHub: the commit ID, pull request ID, branch name, or tag name + // that corresponds to the version of the source code you want to build. + // If a pull request ID is specified, it must use the format pr/pull-request-ID + // (for example pr/25). If a branch name is specified, the branch's HEAD + // commit ID will be used. If not specified, the default branch's HEAD commit + // ID will be used. + // + // * For Bitbucket: the commit ID, branch name, or tag name that corresponds + // to the version of the source code you want to build. If a branch name + // is specified, the branch's HEAD commit ID will be used. If not specified, + // the default branch's HEAD commit ID will be used. + // + // * For Amazon Simple Storage Service (Amazon S3): the version ID of the + // object representing the build input ZIP file to use. + // + // SourceVersion is a required field + SourceVersion *string `locationName:"sourceVersion" type:"string" required:"true"` +} + +// String returns the string representation +func (s ProjectSourceVersion) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s ProjectSourceVersion) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *ProjectSourceVersion) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "ProjectSourceVersion"} + if s.SourceIdentifier == nil { + invalidParams.Add(request.NewErrParamRequired("SourceIdentifier")) + } + if s.SourceVersion == nil { + invalidParams.Add(request.NewErrParamRequired("SourceVersion")) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetSourceIdentifier sets the SourceIdentifier field's value. +func (s *ProjectSourceVersion) SetSourceIdentifier(v string) *ProjectSourceVersion { + s.SourceIdentifier = &v + return s +} + +// SetSourceVersion sets the SourceVersion field's value. +func (s *ProjectSourceVersion) SetSourceVersion(v string) *ProjectSourceVersion { + s.SourceVersion = &v + return s +} + // Information about the authorization settings for AWS CodeBuild to access // the source code to be built. // @@ -3982,6 +4181,16 @@ type StartBuildInput struct { // GitHub, an invalidInputException is thrown. ReportBuildStatusOverride *bool `locationName:"reportBuildStatusOverride" type:"boolean"` + // An array of ProjectArtifacts objects. + SecondaryArtifactsOverride []*ProjectArtifacts `locationName:"secondaryArtifactsOverride" type:"list"` + + // An array of ProjectSource objects. + SecondarySourcesOverride []*ProjectSource `locationName:"secondarySourcesOverride" type:"list"` + + // An array of ProjectSourceVersion objects that specify one or more versions + // of the project's secondary sources to be used for this build only. + SecondarySourcesVersionOverride []*ProjectSourceVersion `locationName:"secondarySourcesVersionOverride" type:"list"` + // The name of a service role for this build that overrides the one specified // in the build project. ServiceRoleOverride *string `locationName:"serviceRoleOverride" min:"1" type:"string"` @@ -4073,6 +4282,36 @@ func (s *StartBuildInput) Validate() error { } } } + if s.SecondaryArtifactsOverride != nil { + for i, v := range s.SecondaryArtifactsOverride { + if v == nil { + continue + } + if err := v.Validate(); err != nil { + invalidParams.AddNested(fmt.Sprintf("%s[%v]", "SecondaryArtifactsOverride", i), err.(request.ErrInvalidParams)) + } + } + } + if s.SecondarySourcesOverride != nil { + for i, v := range s.SecondarySourcesOverride { + if v == nil { + continue + } + if err := v.Validate(); err != nil { + invalidParams.AddNested(fmt.Sprintf("%s[%v]", "SecondarySourcesOverride", i), err.(request.ErrInvalidParams)) + } + } + } + if s.SecondarySourcesVersionOverride != nil { + for i, v := range s.SecondarySourcesVersionOverride { + if v == nil { + continue + } + if err := v.Validate(); err != nil { + invalidParams.AddNested(fmt.Sprintf("%s[%v]", "SecondarySourcesVersionOverride", i), err.(request.ErrInvalidParams)) + } + } + } if s.SourceAuthOverride != nil { if err := s.SourceAuthOverride.Validate(); err != nil { invalidParams.AddNested("SourceAuthOverride", err.(request.ErrInvalidParams)) @@ -4169,6 +4408,24 @@ func (s *StartBuildInput) SetReportBuildStatusOverride(v bool) *StartBuildInput return s } +// SetSecondaryArtifactsOverride sets the SecondaryArtifactsOverride field's value. +func (s *StartBuildInput) SetSecondaryArtifactsOverride(v []*ProjectArtifacts) *StartBuildInput { + s.SecondaryArtifactsOverride = v + return s +} + +// SetSecondarySourcesOverride sets the SecondarySourcesOverride field's value. +func (s *StartBuildInput) SetSecondarySourcesOverride(v []*ProjectSource) *StartBuildInput { + s.SecondarySourcesOverride = v + return s +} + +// SetSecondarySourcesVersionOverride sets the SecondarySourcesVersionOverride field's value. +func (s *StartBuildInput) SetSecondarySourcesVersionOverride(v []*ProjectSourceVersion) *StartBuildInput { + s.SecondarySourcesVersionOverride = v + return s +} + // SetServiceRoleOverride sets the ServiceRoleOverride field's value. func (s *StartBuildInput) SetServiceRoleOverride(v string) *StartBuildInput { s.ServiceRoleOverride = &v @@ -4378,6 +4635,12 @@ type UpdateProjectInput struct { // Name is a required field Name *string `locationName:"name" min:"1" type:"string" required:"true"` + // An array of ProjectSource objects. + SecondaryArtifacts []*ProjectArtifacts `locationName:"secondaryArtifacts" type:"list"` + + // An array of ProjectSource objects. + SecondarySources []*ProjectSource `locationName:"secondarySources" type:"list"` + // The replacement ARN of the AWS Identity and Access Management (IAM) role // that enables AWS CodeBuild to interact with dependent AWS services on behalf // of the AWS account. @@ -4444,6 +4707,26 @@ func (s *UpdateProjectInput) Validate() error { invalidParams.AddNested("Environment", err.(request.ErrInvalidParams)) } } + if s.SecondaryArtifacts != nil { + for i, v := range s.SecondaryArtifacts { + if v == nil { + continue + } + if err := v.Validate(); err != nil { + invalidParams.AddNested(fmt.Sprintf("%s[%v]", "SecondaryArtifacts", i), err.(request.ErrInvalidParams)) + } + } + } + if s.SecondarySources != nil { + for i, v := range s.SecondarySources { + if v == nil { + continue + } + if err := v.Validate(); err != nil { + invalidParams.AddNested(fmt.Sprintf("%s[%v]", "SecondarySources", i), err.(request.ErrInvalidParams)) + } + } + } if s.Source != nil { if err := s.Source.Validate(); err != nil { invalidParams.AddNested("Source", err.(request.ErrInvalidParams)) @@ -4513,6 +4796,18 @@ func (s *UpdateProjectInput) SetName(v string) *UpdateProjectInput { return s } +// SetSecondaryArtifacts sets the SecondaryArtifacts field's value. +func (s *UpdateProjectInput) SetSecondaryArtifacts(v []*ProjectArtifacts) *UpdateProjectInput { + s.SecondaryArtifacts = v + return s +} + +// SetSecondarySources sets the SecondarySources field's value. +func (s *UpdateProjectInput) SetSecondarySources(v []*ProjectSource) *UpdateProjectInput { + s.SecondarySources = v + return s +} + // SetServiceRole sets the ServiceRole field's value. func (s *UpdateProjectInput) SetServiceRole(v string) *UpdateProjectInput { s.ServiceRole = &v @@ -4951,6 +5246,9 @@ const ( // SourceTypeGithubEnterprise is a SourceType enum value SourceTypeGithubEnterprise = "GITHUB_ENTERPRISE" + + // SourceTypeNoSource is a SourceType enum value + SourceTypeNoSource = "NO_SOURCE" ) const ( diff --git a/vendor/github.com/aws/aws-sdk-go/service/eks/api.go b/vendor/github.com/aws/aws-sdk-go/service/eks/api.go index 4d76063f1b8..bb1cefd8892 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/eks/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/eks/api.go @@ -104,11 +104,11 @@ func (c *EKS) CreateClusterRequest(input *CreateClusterInput) (req *request.Requ // These errors are usually caused by a server-side issue. // // * ErrCodeServiceUnavailableException "ServiceUnavailableException" -// The service is unavailable, back off and retry the operation. +// The service is unavailable. Back off and retry the operation. // // * ErrCodeUnsupportedAvailabilityZoneException "UnsupportedAvailabilityZoneException" // At least one of your specified cluster subnets is in an Availability Zone -// that does not support Amazon EKS. The exception output will specify the supported +// that does not support Amazon EKS. The exception output specifies the supported // Availability Zones for your account, from which you can choose subnets for // your cluster. // @@ -200,7 +200,7 @@ func (c *EKS) DeleteClusterRequest(input *DeleteClusterInput) (req *request.Requ // // * ErrCodeResourceNotFoundException "ResourceNotFoundException" // The specified resource could not be found. You can view your available clusters -// with ListClusters. Amazon EKS clusters are region-specific. +// with ListClusters. Amazon EKS clusters are Region-specific. // // * ErrCodeClientException "ClientException" // These errors are usually caused by a client action, such as using an action @@ -211,7 +211,7 @@ func (c *EKS) DeleteClusterRequest(input *DeleteClusterInput) (req *request.Requ // These errors are usually caused by a server-side issue. // // * ErrCodeServiceUnavailableException "ServiceUnavailableException" -// The service is unavailable, back off and retry the operation. +// The service is unavailable. Back off and retry the operation. // // See also, https://docs.aws.amazon.com/goto/WebAPI/eks-2017-11-01/DeleteCluster func (c *EKS) DeleteCluster(input *DeleteClusterInput) (*DeleteClusterOutput, error) { @@ -299,7 +299,7 @@ func (c *EKS) DescribeClusterRequest(input *DescribeClusterInput) (req *request. // Returned Error Codes: // * ErrCodeResourceNotFoundException "ResourceNotFoundException" // The specified resource could not be found. You can view your available clusters -// with ListClusters. Amazon EKS clusters are region-specific. +// with ListClusters. Amazon EKS clusters are Region-specific. // // * ErrCodeClientException "ClientException" // These errors are usually caused by a client action, such as using an action @@ -310,7 +310,7 @@ func (c *EKS) DescribeClusterRequest(input *DescribeClusterInput) (req *request. // These errors are usually caused by a server-side issue. // // * ErrCodeServiceUnavailableException "ServiceUnavailableException" -// The service is unavailable, back off and retry the operation. +// The service is unavailable. Back off and retry the operation. // // See also, https://docs.aws.amazon.com/goto/WebAPI/eks-2017-11-01/DescribeCluster func (c *EKS) DescribeCluster(input *DescribeClusterInput) (*DescribeClusterOutput, error) { @@ -378,7 +378,7 @@ func (c *EKS) ListClustersRequest(input *ListClustersInput) (req *request.Reques // ListClusters API operation for Amazon Elastic Container Service for Kubernetes. // -// Lists the Amazon EKS clusters in your AWS account in the specified region. +// Lists the Amazon EKS clusters in your AWS account in the specified Region. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about @@ -401,7 +401,7 @@ func (c *EKS) ListClustersRequest(input *ListClustersInput) (req *request.Reques // These errors are usually caused by a server-side issue. // // * ErrCodeServiceUnavailableException "ServiceUnavailableException" -// The service is unavailable, back off and retry the operation. +// The service is unavailable. Back off and retry the operation. // // See also, https://docs.aws.amazon.com/goto/WebAPI/eks-2017-11-01/ListClusters func (c *EKS) ListClusters(input *ListClustersInput) (*ListClustersOutput, error) { @@ -474,6 +474,11 @@ type Cluster struct { // The name of the cluster. Name *string `locationName:"name" type:"string"` + // The platform version of your Amazon EKS cluster. For more information, see + // Platform Versions (eks/latest/userguide/platform-versions.html) in the Amazon + // EKS User Guide. + PlatformVersion *string `locationName:"platformVersion" type:"string"` + // The VPC subnets and security groups used by the cluster control plane. Amazon // EKS VPC resources have specific requirements to work properly with Kubernetes. // For more information, see Cluster VPC Considerations (http://docs.aws.amazon.com/eks/latest/userguide/network_reqs.html) @@ -539,6 +544,12 @@ func (s *Cluster) SetName(v string) *Cluster { return s } +// SetPlatformVersion sets the PlatformVersion field's value. +func (s *Cluster) SetPlatformVersion(v string) *Cluster { + s.PlatformVersion = &v + return s +} + // SetResourcesVpcConfig sets the ResourcesVpcConfig field's value. func (s *Cluster) SetResourcesVpcConfig(v *VpcConfigResponse) *Cluster { s.ResourcesVpcConfig = v @@ -579,7 +590,9 @@ type CreateClusterInput struct { // EKS VPC resources have specific requirements to work properly with Kubernetes. // For more information, see Cluster VPC Considerations (http://docs.aws.amazon.com/eks/latest/userguide/network_reqs.html) // and Cluster Security Group Considerations (http://docs.aws.amazon.com/eks/latest/userguide/sec-group-reqs.html) - // in the Amazon EKS User Guide. + // in the Amazon EKS User Guide. You must specify at least two subnets. You + // may specify up to 5 security groups, but we recommend that you use a dedicated + // security group for your cluster control plane. // // ResourcesVpcConfig is a required field ResourcesVpcConfig *VpcConfigRequest `locationName:"resourcesVpcConfig" type:"structure" required:"true"` @@ -587,7 +600,7 @@ type CreateClusterInput struct { // The Amazon Resource Name (ARN) of the IAM role that provides permissions // for Amazon EKS to make calls to other AWS API operations on your behalf. // For more information, see Amazon EKS Service IAM Role (http://docs.aws.amazon.com/eks/latest/userguide/service_IAM_role.html) - // in the Amazon EKS User Guide + // in the Amazon EKS User Guide. // // RoleArn is a required field RoleArn *string `locationName:"roleArn" type:"string" required:"true"` @@ -869,7 +882,7 @@ func (s *ListClustersInput) SetNextToken(v string) *ListClustersInput { type ListClustersOutput struct { _ struct{} `type:"structure"` - // A list of all of the clusters for your account in the specified region. + // A list of all of the clusters for your account in the specified Region. Clusters []*string `locationName:"clusters" type:"list"` // The nextToken value to include in a future ListClusters request. When the diff --git a/vendor/github.com/aws/aws-sdk-go/service/eks/doc.go b/vendor/github.com/aws/aws-sdk-go/service/eks/doc.go index 9f819afc685..0f194107613 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/eks/doc.go +++ b/vendor/github.com/aws/aws-sdk-go/service/eks/doc.go @@ -9,21 +9,7 @@ // an open-source system for automating the deployment, scaling, and management // of containerized applications. // -// Amazon EKS runs three Kubernetes control plane instances across three Availability -// Zones to ensure high availability. Amazon EKS automatically detects and replaces -// unhealthy control plane instances, and it provides automated version upgrades -// and patching for them. -// -// Amazon EKS is also integrated with many AWS services to provide scalability -// and security for your applications, including the following: -// -// * Elastic Load Balancing for load distribution -// -// * IAM for authentication -// -// * Amazon VPC for isolation -// -// Amazon EKS runs up to date versions of the open-source Kubernetes software, +// Amazon EKS runs up-to-date versions of the open-source Kubernetes software, // so you can use all the existing plugins and tooling from the Kubernetes community. // Applications running on Amazon EKS are fully compatible with applications // running on any standard Kubernetes environment, whether running in on-premises diff --git a/vendor/github.com/aws/aws-sdk-go/service/eks/errors.go b/vendor/github.com/aws/aws-sdk-go/service/eks/errors.go index 825e7d2dbd8..98a2410c563 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/eks/errors.go +++ b/vendor/github.com/aws/aws-sdk-go/service/eks/errors.go @@ -35,7 +35,7 @@ const ( // "ResourceNotFoundException". // // The specified resource could not be found. You can view your available clusters - // with ListClusters. Amazon EKS clusters are region-specific. + // with ListClusters. Amazon EKS clusters are Region-specific. ErrCodeResourceNotFoundException = "ResourceNotFoundException" // ErrCodeServerException for service response error code @@ -47,14 +47,14 @@ const ( // ErrCodeServiceUnavailableException for service response error code // "ServiceUnavailableException". // - // The service is unavailable, back off and retry the operation. + // The service is unavailable. Back off and retry the operation. ErrCodeServiceUnavailableException = "ServiceUnavailableException" // ErrCodeUnsupportedAvailabilityZoneException for service response error code // "UnsupportedAvailabilityZoneException". // // At least one of your specified cluster subnets is in an Availability Zone - // that does not support Amazon EKS. The exception output will specify the supported + // that does not support Amazon EKS. The exception output specifies the supported // Availability Zones for your account, from which you can choose subnets for // your cluster. ErrCodeUnsupportedAvailabilityZoneException = "UnsupportedAvailabilityZoneException" diff --git a/vendor/github.com/aws/aws-sdk-go/service/iot/api.go b/vendor/github.com/aws/aws-sdk-go/service/iot/api.go index 70ebbdcd43c..5d610e3a8f5 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/iot/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/iot/api.go @@ -1604,6 +1604,9 @@ func (c *IoT) CreateOTAUpdateRequest(input *CreateOTAUpdateInput) (req *request. // * ErrCodeInvalidRequestException "InvalidRequestException" // The request is not valid. // +// * ErrCodeLimitExceededException "LimitExceededException" +// A limit has been exceeded. +// // * ErrCodeResourceNotFoundException "ResourceNotFoundException" // The specified resource does not exist. // @@ -2170,6 +2173,9 @@ func (c *IoT) CreateStreamRequest(input *CreateStreamInput) (req *request.Reques // * ErrCodeInvalidRequestException "InvalidRequestException" // The request is not valid. // +// * ErrCodeLimitExceededException "LimitExceededException" +// A limit has been exceeded. +// // * ErrCodeResourceNotFoundException "ResourceNotFoundException" // The specified resource does not exist. // @@ -3222,6 +3228,10 @@ func (c *IoT) DeleteOTAUpdateRequest(input *DeleteOTAUpdateInput) (req *request. // * ErrCodeServiceUnavailableException "ServiceUnavailableException" // The service is temporarily unavailable. // +// * ErrCodeVersionConflictException "VersionConflictException" +// An exception thrown when the version of an entity specified with the expectedVersion +// parameter does not match the latest version in the system. +// func (c *IoT) DeleteOTAUpdate(input *DeleteOTAUpdateInput) (*DeleteOTAUpdateOutput, error) { req, out := c.DeleteOTAUpdateRequest(input) return out, req.Send() @@ -15165,6 +15175,43 @@ func (s *AuthorizerSummary) SetAuthorizerName(v string) *AuthorizerSummary { return s } +// Configuration for the rollout of OTA updates. +type AwsJobExecutionsRolloutConfig struct { + _ struct{} `type:"structure"` + + // The maximum number of OTA update job executions started per minute. + MaximumPerMinute *int64 `locationName:"maximumPerMinute" min:"1" type:"integer"` +} + +// String returns the string representation +func (s AwsJobExecutionsRolloutConfig) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s AwsJobExecutionsRolloutConfig) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *AwsJobExecutionsRolloutConfig) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "AwsJobExecutionsRolloutConfig"} + if s.MaximumPerMinute != nil && *s.MaximumPerMinute < 1 { + invalidParams.Add(request.NewErrParamMinValue("MaximumPerMinute", 1)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetMaximumPerMinute sets the MaximumPerMinute field's value. +func (s *AwsJobExecutionsRolloutConfig) SetMaximumPerMinute(v int64) *AwsJobExecutionsRolloutConfig { + s.MaximumPerMinute = &v + return s +} + // A Device Defender security profile behavior. type Behavior struct { _ struct{} `type:"structure"` @@ -16214,6 +16261,9 @@ type CodeSigning struct { // A custom method for code signing a file. CustomCodeSigning *CustomCodeSigning `locationName:"customCodeSigning" type:"structure"` + + // Describes the code-signing job. + StartSigningJobParameter *StartSigningJobParameter `locationName:"startSigningJobParameter" type:"structure"` } // String returns the string representation @@ -16229,9 +16279,9 @@ func (s CodeSigning) GoString() string { // Validate inspects the fields of the type to determine if they are valid. func (s *CodeSigning) Validate() error { invalidParams := request.ErrInvalidParams{Context: "CodeSigning"} - if s.CustomCodeSigning != nil { - if err := s.CustomCodeSigning.Validate(); err != nil { - invalidParams.AddNested("CustomCodeSigning", err.(request.ErrInvalidParams)) + if s.StartSigningJobParameter != nil { + if err := s.StartSigningJobParameter.Validate(); err != nil { + invalidParams.AddNested("StartSigningJobParameter", err.(request.ErrInvalidParams)) } } @@ -16253,6 +16303,12 @@ func (s *CodeSigning) SetCustomCodeSigning(v *CustomCodeSigning) *CodeSigning { return s } +// SetStartSigningJobParameter sets the StartSigningJobParameter field's value. +func (s *CodeSigning) SetStartSigningJobParameter(v *StartSigningJobParameter) *CodeSigning { + s.StartSigningJobParameter = v + return s +} + // Describes the certificate chain being used when code signing a file. type CodeSigningCertificateChain struct { _ struct{} `type:"structure"` @@ -16262,9 +16318,6 @@ type CodeSigningCertificateChain struct { // A base64 encoded binary representation of the code signing certificate chain. InlineDocument *string `locationName:"inlineDocument" type:"string"` - - // A stream of the certificate chain files. - Stream *Stream `locationName:"stream" type:"structure"` } // String returns the string representation @@ -16277,21 +16330,6 @@ func (s CodeSigningCertificateChain) GoString() string { return s.String() } -// Validate inspects the fields of the type to determine if they are valid. -func (s *CodeSigningCertificateChain) Validate() error { - invalidParams := request.ErrInvalidParams{Context: "CodeSigningCertificateChain"} - if s.Stream != nil { - if err := s.Stream.Validate(); err != nil { - invalidParams.AddNested("Stream", err.(request.ErrInvalidParams)) - } - } - - if invalidParams.Len() > 0 { - return invalidParams - } - return nil -} - // SetCertificateName sets the CertificateName field's value. func (s *CodeSigningCertificateChain) SetCertificateName(v string) *CodeSigningCertificateChain { s.CertificateName = &v @@ -16304,12 +16342,6 @@ func (s *CodeSigningCertificateChain) SetInlineDocument(v string) *CodeSigningCe return s } -// SetStream sets the Stream field's value. -func (s *CodeSigningCertificateChain) SetStream(v *Stream) *CodeSigningCertificateChain { - s.Stream = v - return s -} - // Describes the signature for a file. type CodeSigningSignature struct { _ struct{} `type:"structure"` @@ -16318,9 +16350,6 @@ type CodeSigningSignature struct { // // InlineDocument is automatically base64 encoded/decoded by the SDK. InlineDocument []byte `locationName:"inlineDocument" type:"blob"` - - // A stream of the code signing signature. - Stream *Stream `locationName:"stream" type:"structure"` } // String returns the string representation @@ -16333,33 +16362,12 @@ func (s CodeSigningSignature) GoString() string { return s.String() } -// Validate inspects the fields of the type to determine if they are valid. -func (s *CodeSigningSignature) Validate() error { - invalidParams := request.ErrInvalidParams{Context: "CodeSigningSignature"} - if s.Stream != nil { - if err := s.Stream.Validate(); err != nil { - invalidParams.AddNested("Stream", err.(request.ErrInvalidParams)) - } - } - - if invalidParams.Len() > 0 { - return invalidParams - } - return nil -} - // SetInlineDocument sets the InlineDocument field's value. func (s *CodeSigningSignature) SetInlineDocument(v []byte) *CodeSigningSignature { s.InlineDocument = v return s } -// SetStream sets the Stream field's value. -func (s *CodeSigningSignature) SetStream(v *Stream) *CodeSigningSignature { - s.Stream = v - return s -} - // Configuration. type Configuration struct { _ struct{} `type:"structure"` @@ -16861,6 +16869,9 @@ type CreateOTAUpdateInput struct { // A list of additional OTA update parameters which are name-value pairs. AdditionalParameters map[string]*string `locationName:"additionalParameters" type:"map"` + // Configuration for the rollout of OTA updates. + AwsJobExecutionsRolloutConfig *AwsJobExecutionsRolloutConfig `locationName:"awsJobExecutionsRolloutConfig" type:"structure"` + // The description of the OTA update. Description *string `locationName:"description" type:"string"` @@ -16930,6 +16941,11 @@ func (s *CreateOTAUpdateInput) Validate() error { if s.Targets != nil && len(s.Targets) < 1 { invalidParams.Add(request.NewErrParamMinLen("Targets", 1)) } + if s.AwsJobExecutionsRolloutConfig != nil { + if err := s.AwsJobExecutionsRolloutConfig.Validate(); err != nil { + invalidParams.AddNested("AwsJobExecutionsRolloutConfig", err.(request.ErrInvalidParams)) + } + } if s.Files != nil { for i, v := range s.Files { if v == nil { @@ -16953,6 +16969,12 @@ func (s *CreateOTAUpdateInput) SetAdditionalParameters(v map[string]*string) *Cr return s } +// SetAwsJobExecutionsRolloutConfig sets the AwsJobExecutionsRolloutConfig field's value. +func (s *CreateOTAUpdateInput) SetAwsJobExecutionsRolloutConfig(v *AwsJobExecutionsRolloutConfig) *CreateOTAUpdateInput { + s.AwsJobExecutionsRolloutConfig = v + return s +} + // SetDescription sets the Description field's value. func (s *CreateOTAUpdateInput) SetDescription(v string) *CreateOTAUpdateInput { s.Description = &v @@ -18178,26 +18200,6 @@ func (s CustomCodeSigning) GoString() string { return s.String() } -// Validate inspects the fields of the type to determine if they are valid. -func (s *CustomCodeSigning) Validate() error { - invalidParams := request.ErrInvalidParams{Context: "CustomCodeSigning"} - if s.CertificateChain != nil { - if err := s.CertificateChain.Validate(); err != nil { - invalidParams.AddNested("CertificateChain", err.(request.ErrInvalidParams)) - } - } - if s.Signature != nil { - if err := s.Signature.Validate(); err != nil { - invalidParams.AddNested("Signature", err.(request.ErrInvalidParams)) - } - } - - if invalidParams.Len() > 0 { - return invalidParams - } - return nil -} - // SetCertificateChain sets the CertificateChain field's value. func (s *CustomCodeSigning) SetCertificateChain(v *CodeSigningCertificateChain) *CustomCodeSigning { s.CertificateChain = v @@ -18622,6 +18624,14 @@ func (s DeleteJobOutput) GoString() string { type DeleteOTAUpdateInput struct { _ struct{} `type:"structure"` + // Specifies if the stream associated with an OTA update should be deleted when + // the OTA update is deleted. + DeleteStream *bool `location:"querystring" locationName:"deleteStream" type:"boolean"` + + // Specifies if the AWS Job associated with the OTA update should be deleted + // with the OTA update is deleted. + ForceDeleteAWSJob *bool `location:"querystring" locationName:"forceDeleteAWSJob" type:"boolean"` + // The OTA update ID to delete. // // OtaUpdateId is a required field @@ -18654,6 +18664,18 @@ func (s *DeleteOTAUpdateInput) Validate() error { return nil } +// SetDeleteStream sets the DeleteStream field's value. +func (s *DeleteOTAUpdateInput) SetDeleteStream(v bool) *DeleteOTAUpdateInput { + s.DeleteStream = &v + return s +} + +// SetForceDeleteAWSJob sets the ForceDeleteAWSJob field's value. +func (s *DeleteOTAUpdateInput) SetForceDeleteAWSJob(v bool) *DeleteOTAUpdateInput { + s.ForceDeleteAWSJob = &v + return s +} + // SetOtaUpdateId sets the OtaUpdateId field's value. func (s *DeleteOTAUpdateInput) SetOtaUpdateId(v string) *DeleteOTAUpdateInput { s.OtaUpdateId = &v @@ -21113,6 +21135,45 @@ func (s *DescribeThingTypeOutput) SetThingTypeProperties(v *ThingTypeProperties) return s } +// Describes the location of the updated firmware. +type Destination struct { + _ struct{} `type:"structure"` + + // Describes the location in S3 of the updated firmware. + S3Destination *S3Destination `locationName:"s3Destination" type:"structure"` +} + +// String returns the string representation +func (s Destination) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s Destination) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *Destination) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "Destination"} + if s.S3Destination != nil { + if err := s.S3Destination.Validate(); err != nil { + invalidParams.AddNested("S3Destination", err.(request.ErrInvalidParams)) + } + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetS3Destination sets the S3Destination field's value. +func (s *Destination) SetS3Destination(v *S3Destination) *Destination { + s.S3Destination = v + return s +} + type DetachPolicyInput struct { _ struct{} `type:"structure"` @@ -21914,6 +21975,59 @@ func (s *ExplicitDeny) SetPolicies(v []*Policy) *ExplicitDeny { return s } +// The location of the OTA update. +type FileLocation struct { + _ struct{} `type:"structure"` + + // The location of the updated firmware in S3. + S3Location *S3Location `locationName:"s3Location" type:"structure"` + + // The stream that contains the OTA update. + Stream *Stream `locationName:"stream" type:"structure"` +} + +// String returns the string representation +func (s FileLocation) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s FileLocation) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *FileLocation) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "FileLocation"} + if s.S3Location != nil { + if err := s.S3Location.Validate(); err != nil { + invalidParams.AddNested("S3Location", err.(request.ErrInvalidParams)) + } + } + if s.Stream != nil { + if err := s.Stream.Validate(); err != nil { + invalidParams.AddNested("Stream", err.(request.ErrInvalidParams)) + } + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetS3Location sets the S3Location field's value. +func (s *FileLocation) SetS3Location(v *S3Location) *FileLocation { + s.S3Location = v + return s +} + +// SetStream sets the Stream field's value. +func (s *FileLocation) SetStream(v *Stream) *FileLocation { + s.Stream = v + return s +} + // Describes an action that writes data to an Amazon Kinesis Firehose stream. type FirehoseAction struct { _ struct{} `type:"structure"` @@ -27419,12 +27533,12 @@ type OTAUpdateFile struct { // The code signing method of the file. CodeSigning *CodeSigning `locationName:"codeSigning" type:"structure"` + // The location of the updated firmware. + FileLocation *FileLocation `locationName:"fileLocation" type:"structure"` + // The name of the file. FileName *string `locationName:"fileName" type:"string"` - // The source of the file. - FileSource *Stream `locationName:"fileSource" type:"structure"` - // The file version. FileVersion *string `locationName:"fileVersion" type:"string"` } @@ -27447,9 +27561,9 @@ func (s *OTAUpdateFile) Validate() error { invalidParams.AddNested("CodeSigning", err.(request.ErrInvalidParams)) } } - if s.FileSource != nil { - if err := s.FileSource.Validate(); err != nil { - invalidParams.AddNested("FileSource", err.(request.ErrInvalidParams)) + if s.FileLocation != nil { + if err := s.FileLocation.Validate(); err != nil { + invalidParams.AddNested("FileLocation", err.(request.ErrInvalidParams)) } } @@ -27471,15 +27585,15 @@ func (s *OTAUpdateFile) SetCodeSigning(v *CodeSigning) *OTAUpdateFile { return s } -// SetFileName sets the FileName field's value. -func (s *OTAUpdateFile) SetFileName(v string) *OTAUpdateFile { - s.FileName = &v +// SetFileLocation sets the FileLocation field's value. +func (s *OTAUpdateFile) SetFileLocation(v *FileLocation) *OTAUpdateFile { + s.FileLocation = v return s } -// SetFileSource sets the FileSource field's value. -func (s *OTAUpdateFile) SetFileSource(v *Stream) *OTAUpdateFile { - s.FileSource = v +// SetFileName sets the FileName field's value. +func (s *OTAUpdateFile) SetFileName(v string) *OTAUpdateFile { + s.FileName = &v return s } @@ -27502,6 +27616,9 @@ type OTAUpdateInfo struct { // The AWS IoT job ID associated with the OTA update. AwsIotJobId *string `locationName:"awsIotJobId" type:"string"` + // Configuration for the rollout of OTA updates. + AwsJobExecutionsRolloutConfig *AwsJobExecutionsRolloutConfig `locationName:"awsJobExecutionsRolloutConfig" type:"structure"` + // The date when the OTA update was created. CreationDate *time.Time `locationName:"creationDate" type:"timestamp"` @@ -27566,6 +27683,12 @@ func (s *OTAUpdateInfo) SetAwsIotJobId(v string) *OTAUpdateInfo { return s } +// SetAwsJobExecutionsRolloutConfig sets the AwsJobExecutionsRolloutConfig field's value. +func (s *OTAUpdateInfo) SetAwsJobExecutionsRolloutConfig(v *AwsJobExecutionsRolloutConfig) *OTAUpdateInfo { + s.AwsJobExecutionsRolloutConfig = v + return s +} + // SetCreationDate sets the CreationDate field's value. func (s *OTAUpdateInfo) SetCreationDate(v time.Time) *OTAUpdateInfo { s.CreationDate = &v @@ -28871,21 +28994,63 @@ func (s *S3Action) SetRoleArn(v string) *S3Action { return s } -// The location in S3 the contains the files to stream. +// Describes the location of updated firmware in S3. +type S3Destination struct { + _ struct{} `type:"structure"` + + // The S3 bucket that contains the updated firmware. + Bucket *string `locationName:"bucket" min:"1" type:"string"` + + // The S3 prefix. + Prefix *string `locationName:"prefix" type:"string"` +} + +// String returns the string representation +func (s S3Destination) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s S3Destination) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *S3Destination) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "S3Destination"} + if s.Bucket != nil && len(*s.Bucket) < 1 { + invalidParams.Add(request.NewErrParamMinLen("Bucket", 1)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetBucket sets the Bucket field's value. +func (s *S3Destination) SetBucket(v string) *S3Destination { + s.Bucket = &v + return s +} + +// SetPrefix sets the Prefix field's value. +func (s *S3Destination) SetPrefix(v string) *S3Destination { + s.Prefix = &v + return s +} + +// The S3 location. type S3Location struct { _ struct{} `type:"structure"` - // The S3 bucket that contains the file to stream. - // - // Bucket is a required field - Bucket *string `locationName:"bucket" min:"1" type:"string" required:"true"` + // The S3 bucket. + Bucket *string `locationName:"bucket" min:"1" type:"string"` - // The name of the file within the S3 bucket to stream. - // - // Key is a required field - Key *string `locationName:"key" min:"1" type:"string" required:"true"` + // The S3 key. + Key *string `locationName:"key" min:"1" type:"string"` - // The file version. + // The S3 bucket version. Version *string `locationName:"version" type:"string"` } @@ -28902,15 +29067,9 @@ func (s S3Location) GoString() string { // Validate inspects the fields of the type to determine if they are valid. func (s *S3Location) Validate() error { invalidParams := request.ErrInvalidParams{Context: "S3Location"} - if s.Bucket == nil { - invalidParams.Add(request.NewErrParamRequired("Bucket")) - } if s.Bucket != nil && len(*s.Bucket) < 1 { invalidParams.Add(request.NewErrParamMinLen("Bucket", 1)) } - if s.Key == nil { - invalidParams.Add(request.NewErrParamRequired("Key")) - } if s.Key != nil && len(*s.Key) < 1 { invalidParams.Add(request.NewErrParamMinLen("Key", 1)) } @@ -29610,6 +29769,48 @@ func (s SetV2LoggingOptionsOutput) GoString() string { return s.String() } +// Describes the code-signing profile. +type SigningProfileParameter struct { + _ struct{} `type:"structure"` + + // Certificate ARN. + CertificateArn *string `locationName:"certificateArn" type:"string"` + + // The location of the code-signing certificate on your device. + CertificatePathOnDevice *string `locationName:"certificatePathOnDevice" type:"string"` + + // The hardware platform of your device. + Platform *string `locationName:"platform" type:"string"` +} + +// String returns the string representation +func (s SigningProfileParameter) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s SigningProfileParameter) GoString() string { + return s.String() +} + +// SetCertificateArn sets the CertificateArn field's value. +func (s *SigningProfileParameter) SetCertificateArn(v string) *SigningProfileParameter { + s.CertificateArn = &v + return s +} + +// SetCertificatePathOnDevice sets the CertificatePathOnDevice field's value. +func (s *SigningProfileParameter) SetCertificatePathOnDevice(v string) *SigningProfileParameter { + s.CertificatePathOnDevice = &v + return s +} + +// SetPlatform sets the Platform field's value. +func (s *SigningProfileParameter) SetPlatform(v string) *SigningProfileParameter { + s.Platform = &v + return s +} + // Describes an action to publish to an Amazon SNS topic. type SnsAction struct { _ struct{} `type:"structure"` @@ -29803,6 +30004,63 @@ func (s *StartOnDemandAuditTaskOutput) SetTaskId(v string) *StartOnDemandAuditTa return s } +// Information required to start a signing job. +type StartSigningJobParameter struct { + _ struct{} `type:"structure"` + + // The location to write the code-signed file. + Destination *Destination `locationName:"destination" type:"structure"` + + // The code-signing profile name. + SigningProfileName *string `locationName:"signingProfileName" type:"string"` + + // Describes the code-signing profile. + SigningProfileParameter *SigningProfileParameter `locationName:"signingProfileParameter" type:"structure"` +} + +// String returns the string representation +func (s StartSigningJobParameter) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s StartSigningJobParameter) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *StartSigningJobParameter) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "StartSigningJobParameter"} + if s.Destination != nil { + if err := s.Destination.Validate(); err != nil { + invalidParams.AddNested("Destination", err.(request.ErrInvalidParams)) + } + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetDestination sets the Destination field's value. +func (s *StartSigningJobParameter) SetDestination(v *Destination) *StartSigningJobParameter { + s.Destination = v + return s +} + +// SetSigningProfileName sets the SigningProfileName field's value. +func (s *StartSigningJobParameter) SetSigningProfileName(v string) *StartSigningJobParameter { + s.SigningProfileName = &v + return s +} + +// SetSigningProfileParameter sets the SigningProfileParameter field's value. +func (s *StartSigningJobParameter) SetSigningProfileParameter(v *SigningProfileParameter) *StartSigningJobParameter { + s.SigningProfileParameter = v + return s +} + type StartThingRegistrationTaskInput struct { _ struct{} `type:"structure"` diff --git a/vendor/github.com/aws/aws-sdk-go/service/mediapackage/api.go b/vendor/github.com/aws/aws-sdk-go/service/mediapackage/api.go index fa47d515063..a0bac9a2f4e 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/mediapackage/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/mediapackage/api.go @@ -853,6 +853,9 @@ const opRotateChannelCredentials = "RotateChannelCredentials" // // See also, https://docs.aws.amazon.com/goto/WebAPI/mediapackage-2017-10-12/RotateChannelCredentials func (c *MediaPackage) RotateChannelCredentialsRequest(input *RotateChannelCredentialsInput) (req *request.Request, output *RotateChannelCredentialsOutput) { + if c.Client.Config.Logger != nil { + c.Client.Config.Logger.Log("This operation, RotateChannelCredentials, has been deprecated") + } op := &request.Operation{ Name: opRotateChannelCredentials, HTTPMethod: "PUT", @@ -870,7 +873,8 @@ func (c *MediaPackage) RotateChannelCredentialsRequest(input *RotateChannelCrede // RotateChannelCredentials API operation for AWS Elemental MediaPackage. // -// Changes the Channel ingest username and password. +// Changes the Channel's first IngestEndpoint's username and password. WARNING +// - This API is deprecated. Please use RotateIngestEndpointCredentials instead // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about @@ -914,6 +918,95 @@ func (c *MediaPackage) RotateChannelCredentialsWithContext(ctx aws.Context, inpu return out, req.Send() } +const opRotateIngestEndpointCredentials = "RotateIngestEndpointCredentials" + +// RotateIngestEndpointCredentialsRequest generates a "aws/request.Request" representing the +// client's request for the RotateIngestEndpointCredentials operation. The "output" return +// value will be populated with the request's response once the request completes +// successfuly. +// +// Use "Send" method on the returned Request to send the API call to the service. +// the "output" return value is not valid until after Send returns without error. +// +// See RotateIngestEndpointCredentials for more information on using the RotateIngestEndpointCredentials +// API call, and error handling. +// +// This method is useful when you want to inject custom logic or configuration +// into the SDK's request lifecycle. Such as custom headers, or retry logic. +// +// +// // Example sending a request using the RotateIngestEndpointCredentialsRequest method. +// req, resp := client.RotateIngestEndpointCredentialsRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/mediapackage-2017-10-12/RotateIngestEndpointCredentials +func (c *MediaPackage) RotateIngestEndpointCredentialsRequest(input *RotateIngestEndpointCredentialsInput) (req *request.Request, output *RotateIngestEndpointCredentialsOutput) { + op := &request.Operation{ + Name: opRotateIngestEndpointCredentials, + HTTPMethod: "PUT", + HTTPPath: "/channels/{id}/ingest_endpoints/{ingest_endpoint_id}/credentials", + } + + if input == nil { + input = &RotateIngestEndpointCredentialsInput{} + } + + output = &RotateIngestEndpointCredentialsOutput{} + req = c.newRequest(op, input, output) + return +} + +// RotateIngestEndpointCredentials API operation for AWS Elemental MediaPackage. +// +// Rotate the IngestEndpoint's username and password, as specified by the IngestEndpoint's +// id. +// +// Returns awserr.Error for service API and SDK errors. Use runtime type assertions +// with awserr.Error's Code and Message methods to get detailed information about +// the error. +// +// See the AWS API reference guide for AWS Elemental MediaPackage's +// API operation RotateIngestEndpointCredentials for usage and error information. +// +// Returned Error Codes: +// * ErrCodeUnprocessableEntityException "UnprocessableEntityException" +// +// * ErrCodeInternalServerErrorException "InternalServerErrorException" +// +// * ErrCodeForbiddenException "ForbiddenException" +// +// * ErrCodeNotFoundException "NotFoundException" +// +// * ErrCodeServiceUnavailableException "ServiceUnavailableException" +// +// * ErrCodeTooManyRequestsException "TooManyRequestsException" +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/mediapackage-2017-10-12/RotateIngestEndpointCredentials +func (c *MediaPackage) RotateIngestEndpointCredentials(input *RotateIngestEndpointCredentialsInput) (*RotateIngestEndpointCredentialsOutput, error) { + req, out := c.RotateIngestEndpointCredentialsRequest(input) + return out, req.Send() +} + +// RotateIngestEndpointCredentialsWithContext is the same as RotateIngestEndpointCredentials with the addition of +// the ability to pass a context and additional request options. +// +// See RotateIngestEndpointCredentials for details on how to use this API operation. +// +// The context must be non-nil and will be used for request cancellation. If +// the context is nil a panic will occur. In the future the SDK may create +// sub-contexts for http.Requests. See https://golang.org/pkg/context/ +// for more information on using Contexts. +func (c *MediaPackage) RotateIngestEndpointCredentialsWithContext(ctx aws.Context, input *RotateIngestEndpointCredentialsInput, opts ...request.Option) (*RotateIngestEndpointCredentialsOutput, error) { + req, out := c.RotateIngestEndpointCredentialsRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opUpdateChannel = "UpdateChannel" // UpdateChannelRequest generates a "aws/request.Request" representing the @@ -2662,6 +2755,9 @@ func (s *HlsPackage) SetUseAudioRenditionGroup(v bool) *HlsPackage { type IngestEndpoint struct { _ struct{} `type:"structure"` + // The system generated unique identifier for the IngestEndpoint + Id *string `locationName:"id" type:"string"` + // The system generated password for ingest authentication. Password *string `locationName:"password" type:"string"` @@ -2682,6 +2778,12 @@ func (s IngestEndpoint) GoString() string { return s.String() } +// SetId sets the Id field's value. +func (s *IngestEndpoint) SetId(v string) *IngestEndpoint { + s.Id = &v + return s +} + // SetPassword sets the Password field's value. func (s *IngestEndpoint) SetPassword(v string) *IngestEndpoint { s.Password = &v @@ -3100,7 +3202,7 @@ func (s *OriginEndpoint) SetWhitelist(v []*string) *OriginEndpoint { } type RotateChannelCredentialsInput struct { - _ struct{} `type:"structure"` + _ struct{} `deprecated:"true" type:"structure"` // Id is a required field Id *string `location:"uri" locationName:"id" type:"string" required:"true"` @@ -3136,7 +3238,7 @@ func (s *RotateChannelCredentialsInput) SetId(v string) *RotateChannelCredential } type RotateChannelCredentialsOutput struct { - _ struct{} `type:"structure"` + _ struct{} `deprecated:"true" type:"structure"` Arn *string `locationName:"arn" type:"string"` @@ -3182,6 +3284,101 @@ func (s *RotateChannelCredentialsOutput) SetId(v string) *RotateChannelCredentia return s } +type RotateIngestEndpointCredentialsInput struct { + _ struct{} `type:"structure"` + + // Id is a required field + Id *string `location:"uri" locationName:"id" type:"string" required:"true"` + + // IngestEndpointId is a required field + IngestEndpointId *string `location:"uri" locationName:"ingest_endpoint_id" type:"string" required:"true"` +} + +// String returns the string representation +func (s RotateIngestEndpointCredentialsInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s RotateIngestEndpointCredentialsInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *RotateIngestEndpointCredentialsInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "RotateIngestEndpointCredentialsInput"} + if s.Id == nil { + invalidParams.Add(request.NewErrParamRequired("Id")) + } + if s.IngestEndpointId == nil { + invalidParams.Add(request.NewErrParamRequired("IngestEndpointId")) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetId sets the Id field's value. +func (s *RotateIngestEndpointCredentialsInput) SetId(v string) *RotateIngestEndpointCredentialsInput { + s.Id = &v + return s +} + +// SetIngestEndpointId sets the IngestEndpointId field's value. +func (s *RotateIngestEndpointCredentialsInput) SetIngestEndpointId(v string) *RotateIngestEndpointCredentialsInput { + s.IngestEndpointId = &v + return s +} + +type RotateIngestEndpointCredentialsOutput struct { + _ struct{} `type:"structure"` + + Arn *string `locationName:"arn" type:"string"` + + Description *string `locationName:"description" type:"string"` + + // An HTTP Live Streaming (HLS) ingest resource configuration. + HlsIngest *HlsIngest `locationName:"hlsIngest" type:"structure"` + + Id *string `locationName:"id" type:"string"` +} + +// String returns the string representation +func (s RotateIngestEndpointCredentialsOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s RotateIngestEndpointCredentialsOutput) GoString() string { + return s.String() +} + +// SetArn sets the Arn field's value. +func (s *RotateIngestEndpointCredentialsOutput) SetArn(v string) *RotateIngestEndpointCredentialsOutput { + s.Arn = &v + return s +} + +// SetDescription sets the Description field's value. +func (s *RotateIngestEndpointCredentialsOutput) SetDescription(v string) *RotateIngestEndpointCredentialsOutput { + s.Description = &v + return s +} + +// SetHlsIngest sets the HlsIngest field's value. +func (s *RotateIngestEndpointCredentialsOutput) SetHlsIngest(v *HlsIngest) *RotateIngestEndpointCredentialsOutput { + s.HlsIngest = v + return s +} + +// SetId sets the Id field's value. +func (s *RotateIngestEndpointCredentialsOutput) SetId(v string) *RotateIngestEndpointCredentialsOutput { + s.Id = &v + return s +} + // A configuration for accessing an external Secure Packager and Encoder Key // Exchange (SPEKE) service that will provide encryption keys. type SpekeKeyProvider struct { diff --git a/vendor/github.com/aws/aws-sdk-go/service/redshift/api.go b/vendor/github.com/aws/aws-sdk-go/service/redshift/api.go index 9aef96db1a2..abf5b5076c8 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/redshift/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/redshift/api.go @@ -6905,7 +6905,24 @@ func (c *Redshift) ResizeClusterRequest(input *ResizeClusterInput) (req *request // ResizeCluster API operation for Amazon Redshift. // -// Changes the cluster's type, node type, or number of nodes. +// Changes the size of the cluster. You can change the cluster's type, or change +// the number or type of nodes. The default behavior is to use the elastic resize +// method. With an elastic resize your cluster is avaialble for read and write +// operations more quickly than with the classic resize method. +// +// Elastic resize operations have the following restrictions: +// +// * You can only resize clusters of the following types: +// +// dc2.large +// +// dc2.8xlarge +// +// ds2.xlarge +// +// ds2.8xlarge +// +// * The type of nodes you add must match the node type for the cluster. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about @@ -16692,7 +16709,8 @@ type ResizeClusterInput struct { _ struct{} `type:"structure"` // A boolean value indicating whether the resize operation is using the classic - // resize process. + // resize process. If you don't provide this parameter or set the value to false + // the resize type is elastic. Classic *bool `type:"boolean"` // The unique identifier for the cluster to resize. diff --git a/vendor/github.com/aws/aws-sdk-go/service/sagemaker/api.go b/vendor/github.com/aws/aws-sdk-go/service/sagemaker/api.go index 76505fc2101..b070e16e246 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/sagemaker/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/sagemaker/api.go @@ -750,6 +750,15 @@ func (c *SageMaker) CreatePresignedNotebookInstanceUrlRequest(input *CreatePresi // home page from the notebook instance. The console uses this API to get the // URL and show the page. // +// You can restrict access to this API and to the URL that it returns to a list +// of IP addresses that you specify. To restrict access, attach an IAM policy +// that denies access to this API unless the call comes from an IP address in +// the specified list to every AWS Identity and Access Management user, group, +// or role used to access the notebook instance. Use the NotIpAddress condition +// operator and the aws:SourceIP condition context key to specify the list of +// IP addresses that you want to have access to the notebook instance. For more +// information, see nbi-ip-filter. +// // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about // the error. @@ -4416,7 +4425,7 @@ type Channel struct { // algorithm requires the RecordIO format, in which case, Amazon SageMaker wraps // each individual S3 object in a RecordIO record. If the input data is already // in RecordIO format, you don't need to set this attribute. For more information, - // see Create a Dataset Using RecordIO (https://mxnet.incubator.apache.org/how_to/recordio.html?highlight=im2rec) + // see Create a Dataset Using RecordIO (https://mxnet.incubator.apache.org/architecture/note_data_loading.html#data-format) RecordWrapperType *string `type:"string" enum:"RecordWrapper"` } @@ -12120,6 +12129,11 @@ type TransformResources struct { // // InstanceType is a required field InstanceType *string `type:"string" required:"true" enum:"TransformInstanceType"` + + // The Amazon Resource Name (ARN) of a AWS Key Management Service key that Amazon + // SageMaker uses to encrypt data on the storage volume attached to the ML compute + // instance(s) that run the batch transform job. + VolumeKmsKeyId *string `type:"string"` } // String returns the string representation @@ -12163,6 +12177,12 @@ func (s *TransformResources) SetInstanceType(v string) *TransformResources { return s } +// SetVolumeKmsKeyId sets the VolumeKmsKeyId field's value. +func (s *TransformResources) SetVolumeKmsKeyId(v string) *TransformResources { + s.VolumeKmsKeyId = &v + return s +} + // Describes the S3 data source. type TransformS3DataSource struct { _ struct{} `type:"structure"` @@ -12735,6 +12755,9 @@ const ( // EndpointStatusUpdating is a EndpointStatus enum value EndpointStatusUpdating = "Updating" + // EndpointStatusSystemUpdating is a EndpointStatus enum value + EndpointStatusSystemUpdating = "SystemUpdating" + // EndpointStatusRollingBack is a EndpointStatus enum value EndpointStatusRollingBack = "RollingBack" diff --git a/vendor/github.com/aws/aws-sdk-go/service/waf/api.go b/vendor/github.com/aws/aws-sdk-go/service/waf/api.go index e08ff3ee98e..0d9abe4d7f3 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/waf/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/waf/api.go @@ -2094,6 +2094,93 @@ func (c *WAF) DeleteIPSetWithContext(ctx aws.Context, input *DeleteIPSetInput, o return out, req.Send() } +const opDeleteLoggingConfiguration = "DeleteLoggingConfiguration" + +// DeleteLoggingConfigurationRequest generates a "aws/request.Request" representing the +// client's request for the DeleteLoggingConfiguration operation. The "output" return +// value will be populated with the request's response once the request completes +// successfuly. +// +// Use "Send" method on the returned Request to send the API call to the service. +// the "output" return value is not valid until after Send returns without error. +// +// See DeleteLoggingConfiguration for more information on using the DeleteLoggingConfiguration +// API call, and error handling. +// +// This method is useful when you want to inject custom logic or configuration +// into the SDK's request lifecycle. Such as custom headers, or retry logic. +// +// +// // Example sending a request using the DeleteLoggingConfigurationRequest method. +// req, resp := client.DeleteLoggingConfigurationRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/waf-2015-08-24/DeleteLoggingConfiguration +func (c *WAF) DeleteLoggingConfigurationRequest(input *DeleteLoggingConfigurationInput) (req *request.Request, output *DeleteLoggingConfigurationOutput) { + op := &request.Operation{ + Name: opDeleteLoggingConfiguration, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &DeleteLoggingConfigurationInput{} + } + + output = &DeleteLoggingConfigurationOutput{} + req = c.newRequest(op, input, output) + return +} + +// DeleteLoggingConfiguration API operation for AWS WAF. +// +// Permanently deletes the LoggingConfiguration from the specified web ACL. +// +// Returns awserr.Error for service API and SDK errors. Use runtime type assertions +// with awserr.Error's Code and Message methods to get detailed information about +// the error. +// +// See the AWS API reference guide for AWS WAF's +// API operation DeleteLoggingConfiguration for usage and error information. +// +// Returned Error Codes: +// * ErrCodeInternalErrorException "WAFInternalErrorException" +// The operation failed because of a system problem, even though the request +// was valid. Retry your request. +// +// * ErrCodeNonexistentItemException "WAFNonexistentItemException" +// The operation failed because the referenced object doesn't exist. +// +// * ErrCodeStaleDataException "WAFStaleDataException" +// The operation failed because you tried to create, update, or delete an object +// by using a change token that has already been used. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/waf-2015-08-24/DeleteLoggingConfiguration +func (c *WAF) DeleteLoggingConfiguration(input *DeleteLoggingConfigurationInput) (*DeleteLoggingConfigurationOutput, error) { + req, out := c.DeleteLoggingConfigurationRequest(input) + return out, req.Send() +} + +// DeleteLoggingConfigurationWithContext is the same as DeleteLoggingConfiguration with the addition of +// the ability to pass a context and additional request options. +// +// See DeleteLoggingConfiguration for details on how to use this API operation. +// +// The context must be non-nil and will be used for request cancellation. If +// the context is nil a panic will occur. In the future the SDK may create +// sub-contexts for http.Requests. See https://golang.org/pkg/context/ +// for more information on using Contexts. +func (c *WAF) DeleteLoggingConfigurationWithContext(ctx aws.Context, input *DeleteLoggingConfigurationInput, opts ...request.Option) (*DeleteLoggingConfigurationOutput, error) { + req, out := c.DeleteLoggingConfigurationRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opDeletePermissionPolicy = "DeletePermissionPolicy" // DeletePermissionPolicyRequest generates a "aws/request.Request" representing the @@ -2778,6 +2865,24 @@ func (c *WAF) DeleteRuleGroupRequest(input *DeleteRuleGroupInput) (req *request. // // * You tried to delete an IPSet that references one or more IP addresses. // +// * ErrCodeInvalidOperationException "WAFInvalidOperationException" +// The operation failed because there was nothing to do. For example: +// +// * You tried to remove a Rule from a WebACL, but the Rule isn't in the +// specified WebACL. +// +// * You tried to remove an IP address from an IPSet, but the IP address +// isn't in the specified IPSet. +// +// * You tried to remove a ByteMatchTuple from a ByteMatchSet, but the ByteMatchTuple +// isn't in the specified WebACL. +// +// * You tried to add a Rule to a WebACL, but the Rule already exists in +// the specified WebACL. +// +// * You tried to add a ByteMatchTuple to a ByteMatchSet, but the ByteMatchTuple +// already exists in the specified WebACL. +// // See also, https://docs.aws.amazon.com/goto/WebAPI/waf-2015-08-24/DeleteRuleGroup func (c *WAF) DeleteRuleGroup(input *DeleteRuleGroupInput) (*DeleteRuleGroupOutput, error) { req, out := c.DeleteRuleGroupRequest(input) @@ -3753,6 +3858,89 @@ func (c *WAF) GetIPSetWithContext(ctx aws.Context, input *GetIPSetInput, opts .. return out, req.Send() } +const opGetLoggingConfiguration = "GetLoggingConfiguration" + +// GetLoggingConfigurationRequest generates a "aws/request.Request" representing the +// client's request for the GetLoggingConfiguration operation. The "output" return +// value will be populated with the request's response once the request completes +// successfuly. +// +// Use "Send" method on the returned Request to send the API call to the service. +// the "output" return value is not valid until after Send returns without error. +// +// See GetLoggingConfiguration for more information on using the GetLoggingConfiguration +// API call, and error handling. +// +// This method is useful when you want to inject custom logic or configuration +// into the SDK's request lifecycle. Such as custom headers, or retry logic. +// +// +// // Example sending a request using the GetLoggingConfigurationRequest method. +// req, resp := client.GetLoggingConfigurationRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/waf-2015-08-24/GetLoggingConfiguration +func (c *WAF) GetLoggingConfigurationRequest(input *GetLoggingConfigurationInput) (req *request.Request, output *GetLoggingConfigurationOutput) { + op := &request.Operation{ + Name: opGetLoggingConfiguration, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &GetLoggingConfigurationInput{} + } + + output = &GetLoggingConfigurationOutput{} + req = c.newRequest(op, input, output) + return +} + +// GetLoggingConfiguration API operation for AWS WAF. +// +// Returns the LoggingConfiguration for the specified web ACL. +// +// Returns awserr.Error for service API and SDK errors. Use runtime type assertions +// with awserr.Error's Code and Message methods to get detailed information about +// the error. +// +// See the AWS API reference guide for AWS WAF's +// API operation GetLoggingConfiguration for usage and error information. +// +// Returned Error Codes: +// * ErrCodeInternalErrorException "WAFInternalErrorException" +// The operation failed because of a system problem, even though the request +// was valid. Retry your request. +// +// * ErrCodeNonexistentItemException "WAFNonexistentItemException" +// The operation failed because the referenced object doesn't exist. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/waf-2015-08-24/GetLoggingConfiguration +func (c *WAF) GetLoggingConfiguration(input *GetLoggingConfigurationInput) (*GetLoggingConfigurationOutput, error) { + req, out := c.GetLoggingConfigurationRequest(input) + return out, req.Send() +} + +// GetLoggingConfigurationWithContext is the same as GetLoggingConfiguration with the addition of +// the ability to pass a context and additional request options. +// +// See GetLoggingConfiguration for details on how to use this API operation. +// +// The context must be non-nil and will be used for request cancellation. If +// the context is nil a panic will occur. In the future the SDK may create +// sub-contexts for http.Requests. See https://golang.org/pkg/context/ +// for more information on using Contexts. +func (c *WAF) GetLoggingConfigurationWithContext(ctx aws.Context, input *GetLoggingConfigurationInput, opts ...request.Option) (*GetLoggingConfigurationOutput, error) { + req, out := c.GetLoggingConfigurationRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opGetPermissionPolicy = "GetPermissionPolicy" // GetPermissionPolicyRequest generates a "aws/request.Request" representing the @@ -5196,6 +5384,118 @@ func (c *WAF) ListIPSetsWithContext(ctx aws.Context, input *ListIPSetsInput, opt return out, req.Send() } +const opListLoggingConfigurations = "ListLoggingConfigurations" + +// ListLoggingConfigurationsRequest generates a "aws/request.Request" representing the +// client's request for the ListLoggingConfigurations operation. The "output" return +// value will be populated with the request's response once the request completes +// successfuly. +// +// Use "Send" method on the returned Request to send the API call to the service. +// the "output" return value is not valid until after Send returns without error. +// +// See ListLoggingConfigurations for more information on using the ListLoggingConfigurations +// API call, and error handling. +// +// This method is useful when you want to inject custom logic or configuration +// into the SDK's request lifecycle. Such as custom headers, or retry logic. +// +// +// // Example sending a request using the ListLoggingConfigurationsRequest method. +// req, resp := client.ListLoggingConfigurationsRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/waf-2015-08-24/ListLoggingConfigurations +func (c *WAF) ListLoggingConfigurationsRequest(input *ListLoggingConfigurationsInput) (req *request.Request, output *ListLoggingConfigurationsOutput) { + op := &request.Operation{ + Name: opListLoggingConfigurations, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &ListLoggingConfigurationsInput{} + } + + output = &ListLoggingConfigurationsOutput{} + req = c.newRequest(op, input, output) + return +} + +// ListLoggingConfigurations API operation for AWS WAF. +// +// Returns an array of LoggingConfiguration objects. +// +// Returns awserr.Error for service API and SDK errors. Use runtime type assertions +// with awserr.Error's Code and Message methods to get detailed information about +// the error. +// +// See the AWS API reference guide for AWS WAF's +// API operation ListLoggingConfigurations for usage and error information. +// +// Returned Error Codes: +// * ErrCodeInternalErrorException "WAFInternalErrorException" +// The operation failed because of a system problem, even though the request +// was valid. Retry your request. +// +// * ErrCodeNonexistentItemException "WAFNonexistentItemException" +// The operation failed because the referenced object doesn't exist. +// +// * ErrCodeInvalidParameterException "WAFInvalidParameterException" +// The operation failed because AWS WAF didn't recognize a parameter in the +// request. For example: +// +// * You specified an invalid parameter name. +// +// * You specified an invalid value. +// +// * You tried to update an object (ByteMatchSet, IPSet, Rule, or WebACL) +// using an action other than INSERT or DELETE. +// +// * You tried to create a WebACL with a DefaultActionType other than ALLOW, +// BLOCK, or COUNT. +// +// * You tried to create a RateBasedRule with a RateKey value other than +// IP. +// +// * You tried to update a WebACL with a WafActionType other than ALLOW, +// BLOCK, or COUNT. +// +// * You tried to update a ByteMatchSet with a FieldToMatchType other than +// HEADER, METHOD, QUERY_STRING, URI, or BODY. +// +// * You tried to update a ByteMatchSet with a Field of HEADER but no value +// for Data. +// +// * Your request references an ARN that is malformed, or corresponds to +// a resource with which a web ACL cannot be associated. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/waf-2015-08-24/ListLoggingConfigurations +func (c *WAF) ListLoggingConfigurations(input *ListLoggingConfigurationsInput) (*ListLoggingConfigurationsOutput, error) { + req, out := c.ListLoggingConfigurationsRequest(input) + return out, req.Send() +} + +// ListLoggingConfigurationsWithContext is the same as ListLoggingConfigurations with the addition of +// the ability to pass a context and additional request options. +// +// See ListLoggingConfigurations for details on how to use this API operation. +// +// The context must be non-nil and will be used for request cancellation. If +// the context is nil a panic will occur. In the future the SDK may create +// sub-contexts for http.Requests. See https://golang.org/pkg/context/ +// for more information on using Contexts. +func (c *WAF) ListLoggingConfigurationsWithContext(ctx aws.Context, input *ListLoggingConfigurationsInput, opts ...request.Option) (*ListLoggingConfigurationsOutput, error) { + req, out := c.ListLoggingConfigurationsRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opListRateBasedRules = "ListRateBasedRules" // ListRateBasedRulesRequest generates a "aws/request.Request" representing the @@ -6031,6 +6331,108 @@ func (c *WAF) ListXssMatchSetsWithContext(ctx aws.Context, input *ListXssMatchSe return out, req.Send() } +const opPutLoggingConfiguration = "PutLoggingConfiguration" + +// PutLoggingConfigurationRequest generates a "aws/request.Request" representing the +// client's request for the PutLoggingConfiguration operation. The "output" return +// value will be populated with the request's response once the request completes +// successfuly. +// +// Use "Send" method on the returned Request to send the API call to the service. +// the "output" return value is not valid until after Send returns without error. +// +// See PutLoggingConfiguration for more information on using the PutLoggingConfiguration +// API call, and error handling. +// +// This method is useful when you want to inject custom logic or configuration +// into the SDK's request lifecycle. Such as custom headers, or retry logic. +// +// +// // Example sending a request using the PutLoggingConfigurationRequest method. +// req, resp := client.PutLoggingConfigurationRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/waf-2015-08-24/PutLoggingConfiguration +func (c *WAF) PutLoggingConfigurationRequest(input *PutLoggingConfigurationInput) (req *request.Request, output *PutLoggingConfigurationOutput) { + op := &request.Operation{ + Name: opPutLoggingConfiguration, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &PutLoggingConfigurationInput{} + } + + output = &PutLoggingConfigurationOutput{} + req = c.newRequest(op, input, output) + return +} + +// PutLoggingConfiguration API operation for AWS WAF. +// +// Associates a LoggingConfiguration with a specified web ACL. +// +// You can access information about all traffic that AWS WAF inspects using +// the following steps: +// +// Create an Amazon Kinesis Data Firehose delivery stream. For more information, +// see Creating an Amazon Kinesis Data Firehose Delivery Stream (https://docs.aws.amazon.com/firehose/latest/dev/what-is-this-service.html). +// +// Associate that delivery stream to your web ACL using a PutLoggingConfiguration +// request. +// +// When you successfully enable logging using a PutLoggingConfiguration request, +// AWS WAF will create a service linked role with the necessary permissions +// to write logs to the Amazon Kinesis Data Firehose delivery stream. For more +// information, see Logging Web ACL Traffic Information (http://docs.aws.amazon.com/waf/latest/developerguide/logging.html) +// in the AWS WAF Developer Guide. +// +// Returns awserr.Error for service API and SDK errors. Use runtime type assertions +// with awserr.Error's Code and Message methods to get detailed information about +// the error. +// +// See the AWS API reference guide for AWS WAF's +// API operation PutLoggingConfiguration for usage and error information. +// +// Returned Error Codes: +// * ErrCodeInternalErrorException "WAFInternalErrorException" +// The operation failed because of a system problem, even though the request +// was valid. Retry your request. +// +// * ErrCodeNonexistentItemException "WAFNonexistentItemException" +// The operation failed because the referenced object doesn't exist. +// +// * ErrCodeStaleDataException "WAFStaleDataException" +// The operation failed because you tried to create, update, or delete an object +// by using a change token that has already been used. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/waf-2015-08-24/PutLoggingConfiguration +func (c *WAF) PutLoggingConfiguration(input *PutLoggingConfigurationInput) (*PutLoggingConfigurationOutput, error) { + req, out := c.PutLoggingConfigurationRequest(input) + return out, req.Send() +} + +// PutLoggingConfigurationWithContext is the same as PutLoggingConfiguration with the addition of +// the ability to pass a context and additional request options. +// +// See PutLoggingConfiguration for details on how to use this API operation. +// +// The context must be non-nil and will be used for request cancellation. If +// the context is nil a panic will occur. In the future the SDK may create +// sub-contexts for http.Requests. See https://golang.org/pkg/context/ +// for more information on using Contexts. +func (c *WAF) PutLoggingConfigurationWithContext(ctx aws.Context, input *PutLoggingConfigurationInput, opts ...request.Option) (*PutLoggingConfigurationOutput, error) { + req, out := c.PutLoggingConfigurationRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opPutPermissionPolicy = "PutPermissionPolicy" // PutPermissionPolicyRequest generates a "aws/request.Request" representing the @@ -6086,8 +6488,9 @@ func (c *WAF) PutPermissionPolicyRequest(input *PutPermissionPolicyInput) (req * // // * Effect must specify Allow. // -// * The Action in the policy must be waf:UpdateWebACL and waf-regional:UpdateWebACL. -// Any extra or wildcard actions in the policy will be rejected. +// * The Action in the policy must be waf:UpdateWebACL, waf-regional:UpdateWebACL, +// waf:GetRuleGroup and waf-regional:GetRuleGroup . Any extra or wildcard +// actions in the policy will be rejected. // // * The policy cannot include a Resource parameter. // @@ -6132,8 +6535,9 @@ func (c *WAF) PutPermissionPolicyRequest(input *PutPermissionPolicyInput) (req * // // * Effect must specify Allow. // -// * The Action in the policy must be waf:UpdateWebACL or waf-regional:UpdateWebACL. -// Any extra or wildcard actions in the policy will be rejected. +// * The Action in the policy must be waf:UpdateWebACL, waf-regional:UpdateWebACL, +// waf:GetRuleGroup and waf-regional:GetRuleGroup . Any extra or wildcard +// actions in the policy will be rejected. // // * The policy cannot include a Resource parameter. // @@ -6279,9 +6683,6 @@ func (c *WAF) UpdateByteMatchSetRequest(input *UpdateByteMatchSetInput) (req *re // * You tried to add a Rule to a WebACL, but the Rule already exists in // the specified WebACL. // -// * You tried to add an IP address to an IPSet, but the IP address already -// exists in the specified IPSet. -// // * You tried to add a ByteMatchTuple to a ByteMatchSet, but the ByteMatchTuple // already exists in the specified WebACL. // @@ -6473,9 +6874,6 @@ func (c *WAF) UpdateGeoMatchSetRequest(input *UpdateGeoMatchSetInput) (req *requ // * You tried to add a Rule to a WebACL, but the Rule already exists in // the specified WebACL. // -// * You tried to add an IP address to an IPSet, but the IP address already -// exists in the specified IPSet. -// // * You tried to add a ByteMatchTuple to a ByteMatchSet, but the ByteMatchTuple // already exists in the specified WebACL. // @@ -6620,9 +7018,10 @@ func (c *WAF) UpdateIPSetRequest(input *UpdateIPSetInput) (req *request.Request, // range of IP addresses from 192.0.2.0 to 192.0.2.255) or 192.0.2.44/32 // (for the individual IP address 192.0.2.44). // -// AWS WAF supports /8, /16, /24, and /32 IP address ranges for IPv4, and /24, -// /32, /48, /56, /64 and /128 for IPv6. For more information about CIDR notation, -// see the Wikipedia entry Classless Inter-Domain Routing (https://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing). +// AWS WAF supports IPv4 address ranges: /8 and any range between /16 through +// /32. AWS WAF supports IPv6 address ranges: /16, /24, /32, /48, /56, /64, +// and /128. For more information about CIDR notation, see the Wikipedia entry +// Classless Inter-Domain Routing (https://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing). // // IPv6 addresses can be represented using any of the following formats: // @@ -6654,6 +7053,8 @@ func (c *WAF) UpdateIPSetRequest(input *UpdateIPSetInput) (req *request.Request, // and/or the IP addresses that you want to delete. If you want to change an // IP address, you delete the existing IP address and add the new one. // +// You can insert a maximum of 1000 addresses in a single request. +// // For more information about how to use the AWS WAF API to allow or block HTTP // requests, see the AWS WAF Developer Guide (http://docs.aws.amazon.com/waf/latest/developerguide/). // @@ -6692,9 +7093,6 @@ func (c *WAF) UpdateIPSetRequest(input *UpdateIPSetInput) (req *request.Request, // * You tried to add a Rule to a WebACL, but the Rule already exists in // the specified WebACL. // -// * You tried to add an IP address to an IPSet, but the IP address already -// exists in the specified IPSet. -// // * You tried to add a ByteMatchTuple to a ByteMatchSet, but the ByteMatchTuple // already exists in the specified WebACL. // @@ -6900,9 +7298,6 @@ func (c *WAF) UpdateRateBasedRuleRequest(input *UpdateRateBasedRuleInput) (req * // * You tried to add a Rule to a WebACL, but the Rule already exists in // the specified WebACL. // -// * You tried to add an IP address to an IPSet, but the IP address already -// exists in the specified IPSet. -// // * You tried to add a ByteMatchTuple to a ByteMatchSet, but the ByteMatchTuple // already exists in the specified WebACL. // @@ -7128,9 +7523,6 @@ func (c *WAF) UpdateRegexMatchSetRequest(input *UpdateRegexMatchSetInput) (req * // * You tried to add a Rule to a WebACL, but the Rule already exists in // the specified WebACL. // -// * You tried to add an IP address to an IPSet, but the IP address already -// exists in the specified IPSet. -// // * You tried to add a ByteMatchTuple to a ByteMatchSet, but the ByteMatchTuple // already exists in the specified WebACL. // @@ -7292,9 +7684,6 @@ func (c *WAF) UpdateRegexPatternSetRequest(input *UpdateRegexPatternSetInput) (r // * You tried to add a Rule to a WebACL, but the Rule already exists in // the specified WebACL. // -// * You tried to add an IP address to an IPSet, but the IP address already -// exists in the specified IPSet. -// // * You tried to add a ByteMatchTuple to a ByteMatchSet, but the ByteMatchTuple // already exists in the specified WebACL. // @@ -7440,9 +7829,6 @@ func (c *WAF) UpdateRuleRequest(input *UpdateRuleInput) (req *request.Request, o // * You tried to add a Rule to a WebACL, but the Rule already exists in // the specified WebACL. // -// * You tried to add an IP address to an IPSet, but the IP address already -// exists in the specified IPSet. -// // * You tried to add a ByteMatchTuple to a ByteMatchSet, but the ByteMatchTuple // already exists in the specified WebACL. // @@ -7648,9 +8034,6 @@ func (c *WAF) UpdateRuleGroupRequest(input *UpdateRuleGroupInput) (req *request. // * You tried to add a Rule to a WebACL, but the Rule already exists in // the specified WebACL. // -// * You tried to add an IP address to an IPSet, but the IP address already -// exists in the specified IPSet. -// // * You tried to add a ByteMatchTuple to a ByteMatchSet, but the ByteMatchTuple // already exists in the specified WebACL. // @@ -7770,6 +8153,8 @@ func (c *WAF) UpdateSizeConstraintSetRequest(input *UpdateSizeConstraintSetInput // of the request body are not supported because the AWS resource forwards // only the first 8192 bytes of your request to AWS WAF. // +// You can only specify a single type of TextTransformation. +// // * A ComparisonOperator used for evaluating the selected part of the request // against the specified Size, such as equals, greater than, less than, and // so on. @@ -7830,9 +8215,6 @@ func (c *WAF) UpdateSizeConstraintSetRequest(input *UpdateSizeConstraintSetInput // * You tried to add a Rule to a WebACL, but the Rule already exists in // the specified WebACL. // -// * You tried to add an IP address to an IPSet, but the IP address already -// exists in the specified IPSet. -// // * You tried to add a ByteMatchTuple to a ByteMatchSet, but the ByteMatchTuple // already exists in the specified WebACL. // @@ -7972,12 +8354,15 @@ func (c *WAF) UpdateSqlInjectionMatchSetRequest(input *UpdateSqlInjectionMatchSe // object and add a new one. // // * FieldToMatch: The part of web requests that you want AWS WAF to inspect -// and, if you want AWS WAF to inspect a header, the name of the header. +// and, if you want AWS WAF to inspect a header or custom query parameter, +// the name of the header or parameter. // // * TextTransformation: Which text transformation, if any, to perform on // the web request before inspecting the request for snippets of malicious // SQL code. // +// You can only specify a single type of TextTransformation. +// // You use SqlInjectionMatchSet objects to specify which CloudFront requests // you want to allow, block, or count. For example, if you're receiving requests // that contain snippets of SQL code in the query string and you want to block @@ -8028,9 +8413,6 @@ func (c *WAF) UpdateSqlInjectionMatchSetRequest(input *UpdateSqlInjectionMatchSe // * You tried to add a Rule to a WebACL, but the Rule already exists in // the specified WebACL. // -// * You tried to add an IP address to an IPSet, but the IP address already -// exists in the specified IPSet. -// // * You tried to add a ByteMatchTuple to a ByteMatchSet, but the ByteMatchTuple // already exists in the specified WebACL. // @@ -8242,9 +8624,6 @@ func (c *WAF) UpdateWebACLRequest(input *UpdateWebACLInput) (req *request.Reques // * You tried to add a Rule to a WebACL, but the Rule already exists in // the specified WebACL. // -// * You tried to add an IP address to an IPSet, but the IP address already -// exists in the specified IPSet. -// // * You tried to add a ByteMatchTuple to a ByteMatchSet, but the ByteMatchTuple // already exists in the specified WebACL. // @@ -8387,12 +8766,15 @@ func (c *WAF) UpdateXssMatchSetRequest(input *UpdateXssMatchSetInput) (req *requ // add a new one. // // * FieldToMatch: The part of web requests that you want AWS WAF to inspect -// and, if you want AWS WAF to inspect a header, the name of the header. +// and, if you want AWS WAF to inspect a header or custom query parameter, +// the name of the header or parameter. // // * TextTransformation: Which text transformation, if any, to perform on // the web request before inspecting the request for cross-site scripting // attacks. // +// You can only specify a single type of TextTransformation. +// // You use XssMatchSet objects to specify which CloudFront requests you want // to allow, block, or count. For example, if you're receiving requests that // contain cross-site scripting attacks in the request body and you want to @@ -8443,9 +8825,6 @@ func (c *WAF) UpdateXssMatchSetRequest(input *UpdateXssMatchSetInput) (req *requ // * You tried to add a Rule to a WebACL, but the Rule already exists in // the specified WebACL. // -// * You tried to add an IP address to an IPSet, but the IP address already -// exists in the specified IPSet. -// // * You tried to add a ByteMatchTuple to a ByteMatchSet, but the ByteMatchTuple // already exists in the specified WebACL. // @@ -8923,6 +9302,14 @@ type ByteMatchTuple struct { // of the body, you can create a size constraint set. For more information, // see CreateSizeConstraintSet. // + // * SINGLE_QUERY_ARG: The parameter in the query string that you will inspect, + // such as UserName or SalesRegion. The maximum length for SINGLE_QUERY_ARG + // is 30 characters. + // + // * ALL_QUERY_ARGS: Similar to SINGLE_QUERY_ARG, but instead of inspecting + // a single parameter, AWS WAF inspects all parameters within the query string + // for the value or regex pattern that you specify in TargetString. + // // If TargetString includes alphabetic characters A-Z and a-z, note that the // value is case sensitive. // @@ -8951,11 +9338,13 @@ type ByteMatchTuple struct { // AWS WAF performs the transformation on TargetString before inspecting a request // for a match. // + // You can only specify a single type of TextTransformation. + // // CMD_LINE // - // When you're concerned that attackers are injecting an operating system commandline - // command and using unusual formatting to disguise some or all of the command, - // use this option to perform the following transformations: + // When you're concerned that attackers are injecting an operating system command + // line command and using unusual formatting to disguise some or all of the + // command, use this option to perform the following transformations: // // * Delete the following characters: \ " ' ^ // @@ -10536,8 +10925,81 @@ func (s *DeleteIPSetInput) Validate() error { if s.IPSetId == nil { invalidParams.Add(request.NewErrParamRequired("IPSetId")) } - if s.IPSetId != nil && len(*s.IPSetId) < 1 { - invalidParams.Add(request.NewErrParamMinLen("IPSetId", 1)) + if s.IPSetId != nil && len(*s.IPSetId) < 1 { + invalidParams.Add(request.NewErrParamMinLen("IPSetId", 1)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetChangeToken sets the ChangeToken field's value. +func (s *DeleteIPSetInput) SetChangeToken(v string) *DeleteIPSetInput { + s.ChangeToken = &v + return s +} + +// SetIPSetId sets the IPSetId field's value. +func (s *DeleteIPSetInput) SetIPSetId(v string) *DeleteIPSetInput { + s.IPSetId = &v + return s +} + +type DeleteIPSetOutput struct { + _ struct{} `type:"structure"` + + // The ChangeToken that you used to submit the DeleteIPSet request. You can + // also use this value to query the status of the request. For more information, + // see GetChangeTokenStatus. + ChangeToken *string `min:"1" type:"string"` +} + +// String returns the string representation +func (s DeleteIPSetOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DeleteIPSetOutput) GoString() string { + return s.String() +} + +// SetChangeToken sets the ChangeToken field's value. +func (s *DeleteIPSetOutput) SetChangeToken(v string) *DeleteIPSetOutput { + s.ChangeToken = &v + return s +} + +type DeleteLoggingConfigurationInput struct { + _ struct{} `type:"structure"` + + // The Amazon Resource Name (ARN) of the web ACL from which you want to delete + // the LoggingConfiguration. + // + // ResourceArn is a required field + ResourceArn *string `min:"1" type:"string" required:"true"` +} + +// String returns the string representation +func (s DeleteLoggingConfigurationInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DeleteLoggingConfigurationInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *DeleteLoggingConfigurationInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "DeleteLoggingConfigurationInput"} + if s.ResourceArn == nil { + invalidParams.Add(request.NewErrParamRequired("ResourceArn")) + } + if s.ResourceArn != nil && len(*s.ResourceArn) < 1 { + invalidParams.Add(request.NewErrParamMinLen("ResourceArn", 1)) } if invalidParams.Len() > 0 { @@ -10546,43 +11008,26 @@ func (s *DeleteIPSetInput) Validate() error { return nil } -// SetChangeToken sets the ChangeToken field's value. -func (s *DeleteIPSetInput) SetChangeToken(v string) *DeleteIPSetInput { - s.ChangeToken = &v - return s -} - -// SetIPSetId sets the IPSetId field's value. -func (s *DeleteIPSetInput) SetIPSetId(v string) *DeleteIPSetInput { - s.IPSetId = &v +// SetResourceArn sets the ResourceArn field's value. +func (s *DeleteLoggingConfigurationInput) SetResourceArn(v string) *DeleteLoggingConfigurationInput { + s.ResourceArn = &v return s } -type DeleteIPSetOutput struct { +type DeleteLoggingConfigurationOutput struct { _ struct{} `type:"structure"` - - // The ChangeToken that you used to submit the DeleteIPSet request. You can - // also use this value to query the status of the request. For more information, - // see GetChangeTokenStatus. - ChangeToken *string `min:"1" type:"string"` } // String returns the string representation -func (s DeleteIPSetOutput) String() string { +func (s DeleteLoggingConfigurationOutput) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s DeleteIPSetOutput) GoString() string { +func (s DeleteLoggingConfigurationOutput) GoString() string { return s.String() } -// SetChangeToken sets the ChangeToken field's value. -func (s *DeleteIPSetOutput) SetChangeToken(v string) *DeleteIPSetOutput { - s.ChangeToken = &v - return s -} - type DeletePermissionPolicyInput struct { _ struct{} `type:"structure"` @@ -11406,10 +11851,14 @@ type FieldToMatch struct { _ struct{} `type:"structure"` // When the value of Type is HEADER, enter the name of the header that you want - // AWS WAF to search, for example, User-Agent or Referer. If the value of Type - // is any other value, omit Data. + // AWS WAF to search, for example, User-Agent or Referer. The name of the header + // is not case sensitive. // - // The name of the header is not case sensitive. + // When the value of Type is SINGLE_QUERY_ARG, enter the name of the parameter + // that you want AWS WAF to search, for example, UserName or SalesRegion. The + // parameter name is not case sensitive. + // + // If the value of Type is any other value, omit Data. Data *string `type:"string"` // The part of the web request that you want AWS WAF to search for a specified @@ -11437,6 +11886,14 @@ type FieldToMatch struct { // of the body, you can create a size constraint set. For more information, // see CreateSizeConstraintSet. // + // * SINGLE_QUERY_ARG: The parameter in the query string that you will inspect, + // such as UserName or SalesRegion. The maximum length for SINGLE_QUERY_ARG + // is 30 characters. + // + // * ALL_QUERY_ARGS: Similar to SINGLE_QUERY_ARG, but rather than inspecting + // a single parameter, AWS WAF will inspect all parameters within the query + // for the value or regex pattern that you specify in TargetString. + // // Type is a required field Type *string `type:"string" required:"true" enum:"MatchFieldType"` } @@ -11997,6 +12454,71 @@ func (s *GetIPSetOutput) SetIPSet(v *IPSet) *GetIPSetOutput { return s } +type GetLoggingConfigurationInput struct { + _ struct{} `type:"structure"` + + // The Amazon Resource Name (ARN) of the web ACL for which you want to get the + // LoggingConfiguration. + // + // ResourceArn is a required field + ResourceArn *string `min:"1" type:"string" required:"true"` +} + +// String returns the string representation +func (s GetLoggingConfigurationInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s GetLoggingConfigurationInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *GetLoggingConfigurationInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "GetLoggingConfigurationInput"} + if s.ResourceArn == nil { + invalidParams.Add(request.NewErrParamRequired("ResourceArn")) + } + if s.ResourceArn != nil && len(*s.ResourceArn) < 1 { + invalidParams.Add(request.NewErrParamMinLen("ResourceArn", 1)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetResourceArn sets the ResourceArn field's value. +func (s *GetLoggingConfigurationInput) SetResourceArn(v string) *GetLoggingConfigurationInput { + s.ResourceArn = &v + return s +} + +type GetLoggingConfigurationOutput struct { + _ struct{} `type:"structure"` + + // The LoggingConfiguration for the specified web ACL. + LoggingConfiguration *LoggingConfiguration `type:"structure"` +} + +// String returns the string representation +func (s GetLoggingConfigurationOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s GetLoggingConfigurationOutput) GoString() string { + return s.String() +} + +// SetLoggingConfiguration sets the LoggingConfiguration field's value. +func (s *GetLoggingConfigurationOutput) SetLoggingConfiguration(v *LoggingConfiguration) *GetLoggingConfigurationOutput { + s.LoggingConfiguration = v + return s +} + type GetPermissionPolicyInput struct { _ struct{} `type:"structure"` @@ -13059,15 +13581,15 @@ func (s *HTTPRequest) SetURI(v string) *HTTPRequest { } // Contains one or more IP addresses or blocks of IP addresses specified in -// Classless Inter-Domain Routing (CIDR) notation. AWS WAF supports /8, /16, -// /24, and /32 IP address ranges for IPv4, and /24, /32, /48, /56, /64 and -// /128 for IPv6. +// Classless Inter-Domain Routing (CIDR) notation. AWS WAF supports IPv4 address +// ranges: /8 and any range between /16 through /32. AWS WAF supports IPv6 address +// ranges: /16, /24, /32, /48, /56, /64, and /128. // // To specify an individual IP address, you specify the four-part IP address // followed by a /32, for example, 192.0.2.0/31. To block a range of IP addresses, -// you can specify a /128, /64, /56, /48, /32, /24, /16, or /8 CIDR. For more -// information about CIDR notation, see the Wikipedia entry Classless Inter-Domain -// Routing (https://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing). +// you can specify /8 or any range between /16 through /32 (for IPv4) or /16, +// /24, /32, /48, /56, /64, or /128 (for IPv6). For more information about CIDR +// notation, see the Wikipedia entry Classless Inter-Domain Routing (https://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing). type IPSet struct { _ struct{} `type:"structure"` @@ -13656,6 +14178,94 @@ func (s *ListIPSetsOutput) SetNextMarker(v string) *ListIPSetsOutput { return s } +type ListLoggingConfigurationsInput struct { + _ struct{} `type:"structure"` + + // Specifies the number of LoggingConfigurations that you want AWS WAF to return + // for this request. If you have more LoggingConfigurations than the number + // that you specify for Limit, the response includes a NextMarker value that + // you can use to get another batch of LoggingConfigurations. + Limit *int64 `type:"integer"` + + // If you specify a value for Limit and you have more LoggingConfigurations + // than the value of Limit, AWS WAF returns a NextMarker value in the response + // that allows you to list another group of LoggingConfigurations. For the second + // and subsequent ListLoggingConfigurations requests, specify the value of NextMarker + // from the previous response to get information about another batch of ListLoggingConfigurations. + NextMarker *string `min:"1" type:"string"` +} + +// String returns the string representation +func (s ListLoggingConfigurationsInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s ListLoggingConfigurationsInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *ListLoggingConfigurationsInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "ListLoggingConfigurationsInput"} + if s.NextMarker != nil && len(*s.NextMarker) < 1 { + invalidParams.Add(request.NewErrParamMinLen("NextMarker", 1)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetLimit sets the Limit field's value. +func (s *ListLoggingConfigurationsInput) SetLimit(v int64) *ListLoggingConfigurationsInput { + s.Limit = &v + return s +} + +// SetNextMarker sets the NextMarker field's value. +func (s *ListLoggingConfigurationsInput) SetNextMarker(v string) *ListLoggingConfigurationsInput { + s.NextMarker = &v + return s +} + +type ListLoggingConfigurationsOutput struct { + _ struct{} `type:"structure"` + + // An array of LoggingConfiguration objects. + LoggingConfigurations []*LoggingConfiguration `type:"list"` + + // If you have more LoggingConfigurations than the number that you specified + // for Limit in the request, the response includes a NextMarker value. To list + // more LoggingConfigurations, submit another ListLoggingConfigurations request, + // and specify the NextMarker value from the response in the NextMarker value + // in the next request. + NextMarker *string `min:"1" type:"string"` +} + +// String returns the string representation +func (s ListLoggingConfigurationsOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s ListLoggingConfigurationsOutput) GoString() string { + return s.String() +} + +// SetLoggingConfigurations sets the LoggingConfigurations field's value. +func (s *ListLoggingConfigurationsOutput) SetLoggingConfigurations(v []*LoggingConfiguration) *ListLoggingConfigurationsOutput { + s.LoggingConfigurations = v + return s +} + +// SetNextMarker sets the NextMarker field's value. +func (s *ListLoggingConfigurationsOutput) SetNextMarker(v string) *ListLoggingConfigurationsOutput { + s.NextMarker = &v + return s +} + type ListRateBasedRulesInput struct { _ struct{} `type:"structure"` @@ -14538,6 +15148,88 @@ func (s *ListXssMatchSetsOutput) SetXssMatchSets(v []*XssMatchSetSummary) *ListX return s } +// The Amazon Kinesis Data Firehose delivery streams, RedactedFields information, +// and the web ACL Amazon Resource Name (ARN). +type LoggingConfiguration struct { + _ struct{} `type:"structure"` + + // An array of Amazon Kinesis Data Firehose delivery stream ARNs. + // + // LogDestinationConfigs is a required field + LogDestinationConfigs []*string `min:"1" type:"list" required:"true"` + + // The parts of the request that you want redacted from the logs. For example, + // if you redact the cookie field, the cookie field in the delivery stream will + // be xxx. + RedactedFields []*FieldToMatch `type:"list"` + + // The Amazon Resource Name (ARN) of the web ACL that you want to associate + // with LogDestinationConfigs. + // + // ResourceArn is a required field + ResourceArn *string `min:"1" type:"string" required:"true"` +} + +// String returns the string representation +func (s LoggingConfiguration) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s LoggingConfiguration) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *LoggingConfiguration) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "LoggingConfiguration"} + if s.LogDestinationConfigs == nil { + invalidParams.Add(request.NewErrParamRequired("LogDestinationConfigs")) + } + if s.LogDestinationConfigs != nil && len(s.LogDestinationConfigs) < 1 { + invalidParams.Add(request.NewErrParamMinLen("LogDestinationConfigs", 1)) + } + if s.ResourceArn == nil { + invalidParams.Add(request.NewErrParamRequired("ResourceArn")) + } + if s.ResourceArn != nil && len(*s.ResourceArn) < 1 { + invalidParams.Add(request.NewErrParamMinLen("ResourceArn", 1)) + } + if s.RedactedFields != nil { + for i, v := range s.RedactedFields { + if v == nil { + continue + } + if err := v.Validate(); err != nil { + invalidParams.AddNested(fmt.Sprintf("%s[%v]", "RedactedFields", i), err.(request.ErrInvalidParams)) + } + } + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetLogDestinationConfigs sets the LogDestinationConfigs field's value. +func (s *LoggingConfiguration) SetLogDestinationConfigs(v []*string) *LoggingConfiguration { + s.LogDestinationConfigs = v + return s +} + +// SetRedactedFields sets the RedactedFields field's value. +func (s *LoggingConfiguration) SetRedactedFields(v []*FieldToMatch) *LoggingConfiguration { + s.RedactedFields = v + return s +} + +// SetResourceArn sets the ResourceArn field's value. +func (s *LoggingConfiguration) SetResourceArn(v string) *LoggingConfiguration { + s.ResourceArn = &v + return s +} + // Specifies the ByteMatchSet, IPSet, SqlInjectionMatchSet, XssMatchSet, RegexMatchSet, // GeoMatchSet, and SizeConstraintSet objects that you want to add to a Rule // and, for each object, indicates whether you want to negate the settings, @@ -14566,7 +15258,7 @@ type Predicate struct { // Negated is a required field Negated *bool `type:"boolean" required:"true"` - // The type of predicate in a Rule, such as ByteMatchSet or IPSet. + // The type of predicate in a Rule, such as ByteMatch or IPSet. // // Type is a required field Type *string `type:"string" required:"true" enum:"PredicateType"` @@ -14622,6 +15314,74 @@ func (s *Predicate) SetType(v string) *Predicate { return s } +type PutLoggingConfigurationInput struct { + _ struct{} `type:"structure"` + + // The Amazon Kinesis Data Firehose delivery streams that contains the inspected + // traffic information, the redacted fields details, and the Amazon Resource + // Name (ARN) of the web ACL to monitor. + // + // LoggingConfiguration is a required field + LoggingConfiguration *LoggingConfiguration `type:"structure" required:"true"` +} + +// String returns the string representation +func (s PutLoggingConfigurationInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s PutLoggingConfigurationInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *PutLoggingConfigurationInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "PutLoggingConfigurationInput"} + if s.LoggingConfiguration == nil { + invalidParams.Add(request.NewErrParamRequired("LoggingConfiguration")) + } + if s.LoggingConfiguration != nil { + if err := s.LoggingConfiguration.Validate(); err != nil { + invalidParams.AddNested("LoggingConfiguration", err.(request.ErrInvalidParams)) + } + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetLoggingConfiguration sets the LoggingConfiguration field's value. +func (s *PutLoggingConfigurationInput) SetLoggingConfiguration(v *LoggingConfiguration) *PutLoggingConfigurationInput { + s.LoggingConfiguration = v + return s +} + +type PutLoggingConfigurationOutput struct { + _ struct{} `type:"structure"` + + // The LoggingConfiguration that you submitted in the request. + LoggingConfiguration *LoggingConfiguration `type:"structure"` +} + +// String returns the string representation +func (s PutLoggingConfigurationOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s PutLoggingConfigurationOutput) GoString() string { + return s.String() +} + +// SetLoggingConfiguration sets the LoggingConfiguration field's value. +func (s *PutLoggingConfigurationOutput) SetLoggingConfiguration(v *LoggingConfiguration) *PutLoggingConfigurationOutput { + s.LoggingConfiguration = v + return s +} + type PutPermissionPolicyInput struct { _ struct{} `type:"structure"` @@ -15010,6 +15770,8 @@ type RegexMatchTuple struct { // AWS WAF performs the transformation on RegexPatternSet before inspecting // a request for a match. // + // You can only specify a single type of TextTransformation. + // // CMD_LINE // // When you're concerned that attackers are injecting an operating system commandline @@ -15763,6 +16525,8 @@ type SizeConstraint struct { // AWS WAF performs the transformation on FieldToMatch before inspecting a request // for a match. // + // You can only specify a single type of TextTransformation. + // // Note that if you choose BODY for the value of Type, you must choose NONE // for TextTransformation because CloudFront forwards only the first 8192 bytes // for inspection. @@ -16240,11 +17004,13 @@ type SqlInjectionMatchTuple struct { // AWS WAF performs the transformation on FieldToMatch before inspecting a request // for a match. // + // You can only specify a single type of TextTransformation. + // // CMD_LINE // - // When you're concerned that attackers are injecting an operating system commandline - // command and using unusual formatting to disguise some or all of the command, - // use this option to perform the following transformations: + // When you're concerned that attackers are injecting an operating system command + // line command and using unusual formatting to disguise some or all of the + // command, use this option to perform the following transformations: // // * Delete the following characters: \ " ' ^ // @@ -16732,6 +17498,8 @@ type UpdateIPSetInput struct { // // * IPSetDescriptor: Contains Type and Value // + // You can insert a maximum of 1000 addresses in a single request. + // // Updates is a required field Updates []*IPSetUpdate `min:"1" type:"list" required:"true"` } @@ -18363,11 +19131,13 @@ type XssMatchTuple struct { // AWS WAF performs the transformation on FieldToMatch before inspecting a request // for a match. // + // You can only specify a single type of TextTransformation. + // // CMD_LINE // - // When you're concerned that attackers are injecting an operating system commandline - // command and using unusual formatting to disguise some or all of the command, - // use this option to perform the following transformations: + // When you're concerned that attackers are injecting an operating system command + // line command and using unusual formatting to disguise some or all of the + // command, use this option to perform the following transformations: // // * Delete the following characters: \ " ' ^ // @@ -19292,6 +20062,12 @@ const ( // MatchFieldTypeBody is a MatchFieldType enum value MatchFieldTypeBody = "BODY" + + // MatchFieldTypeSingleQueryArg is a MatchFieldType enum value + MatchFieldTypeSingleQueryArg = "SINGLE_QUERY_ARG" + + // MatchFieldTypeAllQueryArgs is a MatchFieldType enum value + MatchFieldTypeAllQueryArgs = "ALL_QUERY_ARGS" ) const ( diff --git a/vendor/github.com/aws/aws-sdk-go/service/waf/errors.go b/vendor/github.com/aws/aws-sdk-go/service/waf/errors.go index 97850b5df1e..02c9752b0bc 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/waf/errors.go +++ b/vendor/github.com/aws/aws-sdk-go/service/waf/errors.go @@ -41,9 +41,6 @@ const ( // * You tried to add a Rule to a WebACL, but the Rule already exists in // the specified WebACL. // - // * You tried to add an IP address to an IPSet, but the IP address already - // exists in the specified IPSet. - // // * You tried to add a ByteMatchTuple to a ByteMatchSet, but the ByteMatchTuple // already exists in the specified WebACL. ErrCodeInvalidOperationException = "WAFInvalidOperationException" @@ -93,8 +90,9 @@ const ( // // * Effect must specify Allow. // - // * The Action in the policy must be waf:UpdateWebACL or waf-regional:UpdateWebACL. - // Any extra or wildcard actions in the policy will be rejected. + // * The Action in the policy must be waf:UpdateWebACL, waf-regional:UpdateWebACL, + // waf:GetRuleGroup and waf-regional:GetRuleGroup . Any extra or wildcard + // actions in the policy will be rejected. // // * The policy cannot include a Resource parameter. // diff --git a/vendor/github.com/aws/aws-sdk-go/service/wafregional/api.go b/vendor/github.com/aws/aws-sdk-go/service/wafregional/api.go index cd5c09e23a5..470cefe4995 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/wafregional/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/wafregional/api.go @@ -2212,6 +2212,93 @@ func (c *WAFRegional) DeleteIPSetWithContext(ctx aws.Context, input *waf.DeleteI return out, req.Send() } +const opDeleteLoggingConfiguration = "DeleteLoggingConfiguration" + +// DeleteLoggingConfigurationRequest generates a "aws/request.Request" representing the +// client's request for the DeleteLoggingConfiguration operation. The "output" return +// value will be populated with the request's response once the request completes +// successfuly. +// +// Use "Send" method on the returned Request to send the API call to the service. +// the "output" return value is not valid until after Send returns without error. +// +// See DeleteLoggingConfiguration for more information on using the DeleteLoggingConfiguration +// API call, and error handling. +// +// This method is useful when you want to inject custom logic or configuration +// into the SDK's request lifecycle. Such as custom headers, or retry logic. +// +// +// // Example sending a request using the DeleteLoggingConfigurationRequest method. +// req, resp := client.DeleteLoggingConfigurationRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/waf-regional-2016-11-28/DeleteLoggingConfiguration +func (c *WAFRegional) DeleteLoggingConfigurationRequest(input *waf.DeleteLoggingConfigurationInput) (req *request.Request, output *waf.DeleteLoggingConfigurationOutput) { + op := &request.Operation{ + Name: opDeleteLoggingConfiguration, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &waf.DeleteLoggingConfigurationInput{} + } + + output = &waf.DeleteLoggingConfigurationOutput{} + req = c.newRequest(op, input, output) + return +} + +// DeleteLoggingConfiguration API operation for AWS WAF Regional. +// +// Permanently deletes the LoggingConfiguration from the specified web ACL. +// +// Returns awserr.Error for service API and SDK errors. Use runtime type assertions +// with awserr.Error's Code and Message methods to get detailed information about +// the error. +// +// See the AWS API reference guide for AWS WAF Regional's +// API operation DeleteLoggingConfiguration for usage and error information. +// +// Returned Error Codes: +// * ErrCodeWAFInternalErrorException "WAFInternalErrorException" +// The operation failed because of a system problem, even though the request +// was valid. Retry your request. +// +// * ErrCodeWAFNonexistentItemException "WAFNonexistentItemException" +// The operation failed because the referenced object doesn't exist. +// +// * ErrCodeWAFStaleDataException "WAFStaleDataException" +// The operation failed because you tried to create, update, or delete an object +// by using a change token that has already been used. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/waf-regional-2016-11-28/DeleteLoggingConfiguration +func (c *WAFRegional) DeleteLoggingConfiguration(input *waf.DeleteLoggingConfigurationInput) (*waf.DeleteLoggingConfigurationOutput, error) { + req, out := c.DeleteLoggingConfigurationRequest(input) + return out, req.Send() +} + +// DeleteLoggingConfigurationWithContext is the same as DeleteLoggingConfiguration with the addition of +// the ability to pass a context and additional request options. +// +// See DeleteLoggingConfiguration for details on how to use this API operation. +// +// The context must be non-nil and will be used for request cancellation. If +// the context is nil a panic will occur. In the future the SDK may create +// sub-contexts for http.Requests. See https://golang.org/pkg/context/ +// for more information on using Contexts. +func (c *WAFRegional) DeleteLoggingConfigurationWithContext(ctx aws.Context, input *waf.DeleteLoggingConfigurationInput, opts ...request.Option) (*waf.DeleteLoggingConfigurationOutput, error) { + req, out := c.DeleteLoggingConfigurationRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opDeletePermissionPolicy = "DeletePermissionPolicy" // DeletePermissionPolicyRequest generates a "aws/request.Request" representing the @@ -2896,6 +2983,24 @@ func (c *WAFRegional) DeleteRuleGroupRequest(input *waf.DeleteRuleGroupInput) (r // // * You tried to delete an IPSet that references one or more IP addresses. // +// * ErrCodeWAFInvalidOperationException "WAFInvalidOperationException" +// The operation failed because there was nothing to do. For example: +// +// * You tried to remove a Rule from a WebACL, but the Rule isn't in the +// specified WebACL. +// +// * You tried to remove an IP address from an IPSet, but the IP address +// isn't in the specified IPSet. +// +// * You tried to remove a ByteMatchTuple from a ByteMatchSet, but the ByteMatchTuple +// isn't in the specified WebACL. +// +// * You tried to add a Rule to a WebACL, but the Rule already exists in +// the specified WebACL. +// +// * You tried to add a ByteMatchTuple to a ByteMatchSet, but the ByteMatchTuple +// already exists in the specified WebACL. +// // See also, https://docs.aws.amazon.com/goto/WebAPI/waf-regional-2016-11-28/DeleteRuleGroup func (c *WAFRegional) DeleteRuleGroup(input *waf.DeleteRuleGroupInput) (*waf.DeleteRuleGroupOutput, error) { req, out := c.DeleteRuleGroupRequest(input) @@ -3987,6 +4092,89 @@ func (c *WAFRegional) GetIPSetWithContext(ctx aws.Context, input *waf.GetIPSetIn return out, req.Send() } +const opGetLoggingConfiguration = "GetLoggingConfiguration" + +// GetLoggingConfigurationRequest generates a "aws/request.Request" representing the +// client's request for the GetLoggingConfiguration operation. The "output" return +// value will be populated with the request's response once the request completes +// successfuly. +// +// Use "Send" method on the returned Request to send the API call to the service. +// the "output" return value is not valid until after Send returns without error. +// +// See GetLoggingConfiguration for more information on using the GetLoggingConfiguration +// API call, and error handling. +// +// This method is useful when you want to inject custom logic or configuration +// into the SDK's request lifecycle. Such as custom headers, or retry logic. +// +// +// // Example sending a request using the GetLoggingConfigurationRequest method. +// req, resp := client.GetLoggingConfigurationRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/waf-regional-2016-11-28/GetLoggingConfiguration +func (c *WAFRegional) GetLoggingConfigurationRequest(input *waf.GetLoggingConfigurationInput) (req *request.Request, output *waf.GetLoggingConfigurationOutput) { + op := &request.Operation{ + Name: opGetLoggingConfiguration, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &waf.GetLoggingConfigurationInput{} + } + + output = &waf.GetLoggingConfigurationOutput{} + req = c.newRequest(op, input, output) + return +} + +// GetLoggingConfiguration API operation for AWS WAF Regional. +// +// Returns the LoggingConfiguration for the specified web ACL. +// +// Returns awserr.Error for service API and SDK errors. Use runtime type assertions +// with awserr.Error's Code and Message methods to get detailed information about +// the error. +// +// See the AWS API reference guide for AWS WAF Regional's +// API operation GetLoggingConfiguration for usage and error information. +// +// Returned Error Codes: +// * ErrCodeWAFInternalErrorException "WAFInternalErrorException" +// The operation failed because of a system problem, even though the request +// was valid. Retry your request. +// +// * ErrCodeWAFNonexistentItemException "WAFNonexistentItemException" +// The operation failed because the referenced object doesn't exist. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/waf-regional-2016-11-28/GetLoggingConfiguration +func (c *WAFRegional) GetLoggingConfiguration(input *waf.GetLoggingConfigurationInput) (*waf.GetLoggingConfigurationOutput, error) { + req, out := c.GetLoggingConfigurationRequest(input) + return out, req.Send() +} + +// GetLoggingConfigurationWithContext is the same as GetLoggingConfiguration with the addition of +// the ability to pass a context and additional request options. +// +// See GetLoggingConfiguration for details on how to use this API operation. +// +// The context must be non-nil and will be used for request cancellation. If +// the context is nil a panic will occur. In the future the SDK may create +// sub-contexts for http.Requests. See https://golang.org/pkg/context/ +// for more information on using Contexts. +func (c *WAFRegional) GetLoggingConfigurationWithContext(ctx aws.Context, input *waf.GetLoggingConfigurationInput, opts ...request.Option) (*waf.GetLoggingConfigurationOutput, error) { + req, out := c.GetLoggingConfigurationRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opGetPermissionPolicy = "GetPermissionPolicy" // GetPermissionPolicyRequest generates a "aws/request.Request" representing the @@ -5550,6 +5738,118 @@ func (c *WAFRegional) ListIPSetsWithContext(ctx aws.Context, input *waf.ListIPSe return out, req.Send() } +const opListLoggingConfigurations = "ListLoggingConfigurations" + +// ListLoggingConfigurationsRequest generates a "aws/request.Request" representing the +// client's request for the ListLoggingConfigurations operation. The "output" return +// value will be populated with the request's response once the request completes +// successfuly. +// +// Use "Send" method on the returned Request to send the API call to the service. +// the "output" return value is not valid until after Send returns without error. +// +// See ListLoggingConfigurations for more information on using the ListLoggingConfigurations +// API call, and error handling. +// +// This method is useful when you want to inject custom logic or configuration +// into the SDK's request lifecycle. Such as custom headers, or retry logic. +// +// +// // Example sending a request using the ListLoggingConfigurationsRequest method. +// req, resp := client.ListLoggingConfigurationsRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/waf-regional-2016-11-28/ListLoggingConfigurations +func (c *WAFRegional) ListLoggingConfigurationsRequest(input *waf.ListLoggingConfigurationsInput) (req *request.Request, output *waf.ListLoggingConfigurationsOutput) { + op := &request.Operation{ + Name: opListLoggingConfigurations, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &waf.ListLoggingConfigurationsInput{} + } + + output = &waf.ListLoggingConfigurationsOutput{} + req = c.newRequest(op, input, output) + return +} + +// ListLoggingConfigurations API operation for AWS WAF Regional. +// +// Returns an array of LoggingConfiguration objects. +// +// Returns awserr.Error for service API and SDK errors. Use runtime type assertions +// with awserr.Error's Code and Message methods to get detailed information about +// the error. +// +// See the AWS API reference guide for AWS WAF Regional's +// API operation ListLoggingConfigurations for usage and error information. +// +// Returned Error Codes: +// * ErrCodeWAFInternalErrorException "WAFInternalErrorException" +// The operation failed because of a system problem, even though the request +// was valid. Retry your request. +// +// * ErrCodeWAFNonexistentItemException "WAFNonexistentItemException" +// The operation failed because the referenced object doesn't exist. +// +// * ErrCodeWAFInvalidParameterException "WAFInvalidParameterException" +// The operation failed because AWS WAF didn't recognize a parameter in the +// request. For example: +// +// * You specified an invalid parameter name. +// +// * You specified an invalid value. +// +// * You tried to update an object (ByteMatchSet, IPSet, Rule, or WebACL) +// using an action other than INSERT or DELETE. +// +// * You tried to create a WebACL with a DefaultActionType other than ALLOW, +// BLOCK, or COUNT. +// +// * You tried to create a RateBasedRule with a RateKey value other than +// IP. +// +// * You tried to update a WebACL with a WafActionType other than ALLOW, +// BLOCK, or COUNT. +// +// * You tried to update a ByteMatchSet with a FieldToMatchType other than +// HEADER, METHOD, QUERY_STRING, URI, or BODY. +// +// * You tried to update a ByteMatchSet with a Field of HEADER but no value +// for Data. +// +// * Your request references an ARN that is malformed, or corresponds to +// a resource with which a web ACL cannot be associated. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/waf-regional-2016-11-28/ListLoggingConfigurations +func (c *WAFRegional) ListLoggingConfigurations(input *waf.ListLoggingConfigurationsInput) (*waf.ListLoggingConfigurationsOutput, error) { + req, out := c.ListLoggingConfigurationsRequest(input) + return out, req.Send() +} + +// ListLoggingConfigurationsWithContext is the same as ListLoggingConfigurations with the addition of +// the ability to pass a context and additional request options. +// +// See ListLoggingConfigurations for details on how to use this API operation. +// +// The context must be non-nil and will be used for request cancellation. If +// the context is nil a panic will occur. In the future the SDK may create +// sub-contexts for http.Requests. See https://golang.org/pkg/context/ +// for more information on using Contexts. +func (c *WAFRegional) ListLoggingConfigurationsWithContext(ctx aws.Context, input *waf.ListLoggingConfigurationsInput, opts ...request.Option) (*waf.ListLoggingConfigurationsOutput, error) { + req, out := c.ListLoggingConfigurationsRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opListRateBasedRules = "ListRateBasedRules" // ListRateBasedRulesRequest generates a "aws/request.Request" representing the @@ -6472,6 +6772,108 @@ func (c *WAFRegional) ListXssMatchSetsWithContext(ctx aws.Context, input *waf.Li return out, req.Send() } +const opPutLoggingConfiguration = "PutLoggingConfiguration" + +// PutLoggingConfigurationRequest generates a "aws/request.Request" representing the +// client's request for the PutLoggingConfiguration operation. The "output" return +// value will be populated with the request's response once the request completes +// successfuly. +// +// Use "Send" method on the returned Request to send the API call to the service. +// the "output" return value is not valid until after Send returns without error. +// +// See PutLoggingConfiguration for more information on using the PutLoggingConfiguration +// API call, and error handling. +// +// This method is useful when you want to inject custom logic or configuration +// into the SDK's request lifecycle. Such as custom headers, or retry logic. +// +// +// // Example sending a request using the PutLoggingConfigurationRequest method. +// req, resp := client.PutLoggingConfigurationRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/waf-regional-2016-11-28/PutLoggingConfiguration +func (c *WAFRegional) PutLoggingConfigurationRequest(input *waf.PutLoggingConfigurationInput) (req *request.Request, output *waf.PutLoggingConfigurationOutput) { + op := &request.Operation{ + Name: opPutLoggingConfiguration, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &waf.PutLoggingConfigurationInput{} + } + + output = &waf.PutLoggingConfigurationOutput{} + req = c.newRequest(op, input, output) + return +} + +// PutLoggingConfiguration API operation for AWS WAF Regional. +// +// Associates a LoggingConfiguration with a specified web ACL. +// +// You can access information about all traffic that AWS WAF inspects using +// the following steps: +// +// Create an Amazon Kinesis Data Firehose delivery stream. For more information, +// see Creating an Amazon Kinesis Data Firehose Delivery Stream (https://docs.aws.amazon.com/firehose/latest/dev/what-is-this-service.html). +// +// Associate that delivery stream to your web ACL using a PutLoggingConfiguration +// request. +// +// When you successfully enable logging using a PutLoggingConfiguration request, +// AWS WAF will create a service linked role with the necessary permissions +// to write logs to the Amazon Kinesis Data Firehose delivery stream. For more +// information, see Logging Web ACL Traffic Information (http://docs.aws.amazon.com/waf/latest/developerguide/logging.html) +// in the AWS WAF Developer Guide. +// +// Returns awserr.Error for service API and SDK errors. Use runtime type assertions +// with awserr.Error's Code and Message methods to get detailed information about +// the error. +// +// See the AWS API reference guide for AWS WAF Regional's +// API operation PutLoggingConfiguration for usage and error information. +// +// Returned Error Codes: +// * ErrCodeWAFInternalErrorException "WAFInternalErrorException" +// The operation failed because of a system problem, even though the request +// was valid. Retry your request. +// +// * ErrCodeWAFNonexistentItemException "WAFNonexistentItemException" +// The operation failed because the referenced object doesn't exist. +// +// * ErrCodeWAFStaleDataException "WAFStaleDataException" +// The operation failed because you tried to create, update, or delete an object +// by using a change token that has already been used. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/waf-regional-2016-11-28/PutLoggingConfiguration +func (c *WAFRegional) PutLoggingConfiguration(input *waf.PutLoggingConfigurationInput) (*waf.PutLoggingConfigurationOutput, error) { + req, out := c.PutLoggingConfigurationRequest(input) + return out, req.Send() +} + +// PutLoggingConfigurationWithContext is the same as PutLoggingConfiguration with the addition of +// the ability to pass a context and additional request options. +// +// See PutLoggingConfiguration for details on how to use this API operation. +// +// The context must be non-nil and will be used for request cancellation. If +// the context is nil a panic will occur. In the future the SDK may create +// sub-contexts for http.Requests. See https://golang.org/pkg/context/ +// for more information on using Contexts. +func (c *WAFRegional) PutLoggingConfigurationWithContext(ctx aws.Context, input *waf.PutLoggingConfigurationInput, opts ...request.Option) (*waf.PutLoggingConfigurationOutput, error) { + req, out := c.PutLoggingConfigurationRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opPutPermissionPolicy = "PutPermissionPolicy" // PutPermissionPolicyRequest generates a "aws/request.Request" representing the @@ -6527,8 +6929,9 @@ func (c *WAFRegional) PutPermissionPolicyRequest(input *waf.PutPermissionPolicyI // // * Effect must specify Allow. // -// * The Action in the policy must be waf:UpdateWebACL and waf-regional:UpdateWebACL. -// Any extra or wildcard actions in the policy will be rejected. +// * The Action in the policy must be waf:UpdateWebACL, waf-regional:UpdateWebACL, +// waf:GetRuleGroup and waf-regional:GetRuleGroup . Any extra or wildcard +// actions in the policy will be rejected. // // * The policy cannot include a Resource parameter. // @@ -6573,8 +6976,9 @@ func (c *WAFRegional) PutPermissionPolicyRequest(input *waf.PutPermissionPolicyI // // * Effect must specify Allow. // -// * The Action in the policy must be waf:UpdateWebACL or waf-regional:UpdateWebACL. -// Any extra or wildcard actions in the policy will be rejected. +// * The Action in the policy must be waf:UpdateWebACL, waf-regional:UpdateWebACL, +// waf:GetRuleGroup and waf-regional:GetRuleGroup . Any extra or wildcard +// actions in the policy will be rejected. // // * The policy cannot include a Resource parameter. // @@ -6720,9 +7124,6 @@ func (c *WAFRegional) UpdateByteMatchSetRequest(input *waf.UpdateByteMatchSetInp // * You tried to add a Rule to a WebACL, but the Rule already exists in // the specified WebACL. // -// * You tried to add an IP address to an IPSet, but the IP address already -// exists in the specified IPSet. -// // * You tried to add a ByteMatchTuple to a ByteMatchSet, but the ByteMatchTuple // already exists in the specified WebACL. // @@ -6914,9 +7315,6 @@ func (c *WAFRegional) UpdateGeoMatchSetRequest(input *waf.UpdateGeoMatchSetInput // * You tried to add a Rule to a WebACL, but the Rule already exists in // the specified WebACL. // -// * You tried to add an IP address to an IPSet, but the IP address already -// exists in the specified IPSet. -// // * You tried to add a ByteMatchTuple to a ByteMatchSet, but the ByteMatchTuple // already exists in the specified WebACL. // @@ -7061,9 +7459,10 @@ func (c *WAFRegional) UpdateIPSetRequest(input *waf.UpdateIPSetInput) (req *requ // range of IP addresses from 192.0.2.0 to 192.0.2.255) or 192.0.2.44/32 // (for the individual IP address 192.0.2.44). // -// AWS WAF supports /8, /16, /24, and /32 IP address ranges for IPv4, and /24, -// /32, /48, /56, /64 and /128 for IPv6. For more information about CIDR notation, -// see the Wikipedia entry Classless Inter-Domain Routing (https://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing). +// AWS WAF supports IPv4 address ranges: /8 and any range between /16 through +// /32. AWS WAF supports IPv6 address ranges: /16, /24, /32, /48, /56, /64, +// and /128. For more information about CIDR notation, see the Wikipedia entry +// Classless Inter-Domain Routing (https://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing). // // IPv6 addresses can be represented using any of the following formats: // @@ -7095,6 +7494,8 @@ func (c *WAFRegional) UpdateIPSetRequest(input *waf.UpdateIPSetInput) (req *requ // and/or the IP addresses that you want to delete. If you want to change an // IP address, you delete the existing IP address and add the new one. // +// You can insert a maximum of 1000 addresses in a single request. +// // For more information about how to use the AWS WAF API to allow or block HTTP // requests, see the AWS WAF Developer Guide (http://docs.aws.amazon.com/waf/latest/developerguide/). // @@ -7133,9 +7534,6 @@ func (c *WAFRegional) UpdateIPSetRequest(input *waf.UpdateIPSetInput) (req *requ // * You tried to add a Rule to a WebACL, but the Rule already exists in // the specified WebACL. // -// * You tried to add an IP address to an IPSet, but the IP address already -// exists in the specified IPSet. -// // * You tried to add a ByteMatchTuple to a ByteMatchSet, but the ByteMatchTuple // already exists in the specified WebACL. // @@ -7341,9 +7739,6 @@ func (c *WAFRegional) UpdateRateBasedRuleRequest(input *waf.UpdateRateBasedRuleI // * You tried to add a Rule to a WebACL, but the Rule already exists in // the specified WebACL. // -// * You tried to add an IP address to an IPSet, but the IP address already -// exists in the specified IPSet. -// // * You tried to add a ByteMatchTuple to a ByteMatchSet, but the ByteMatchTuple // already exists in the specified WebACL. // @@ -7569,9 +7964,6 @@ func (c *WAFRegional) UpdateRegexMatchSetRequest(input *waf.UpdateRegexMatchSetI // * You tried to add a Rule to a WebACL, but the Rule already exists in // the specified WebACL. // -// * You tried to add an IP address to an IPSet, but the IP address already -// exists in the specified IPSet. -// // * You tried to add a ByteMatchTuple to a ByteMatchSet, but the ByteMatchTuple // already exists in the specified WebACL. // @@ -7733,9 +8125,6 @@ func (c *WAFRegional) UpdateRegexPatternSetRequest(input *waf.UpdateRegexPattern // * You tried to add a Rule to a WebACL, but the Rule already exists in // the specified WebACL. // -// * You tried to add an IP address to an IPSet, but the IP address already -// exists in the specified IPSet. -// // * You tried to add a ByteMatchTuple to a ByteMatchSet, but the ByteMatchTuple // already exists in the specified WebACL. // @@ -7881,9 +8270,6 @@ func (c *WAFRegional) UpdateRuleRequest(input *waf.UpdateRuleInput) (req *reques // * You tried to add a Rule to a WebACL, but the Rule already exists in // the specified WebACL. // -// * You tried to add an IP address to an IPSet, but the IP address already -// exists in the specified IPSet. -// // * You tried to add a ByteMatchTuple to a ByteMatchSet, but the ByteMatchTuple // already exists in the specified WebACL. // @@ -8089,9 +8475,6 @@ func (c *WAFRegional) UpdateRuleGroupRequest(input *waf.UpdateRuleGroupInput) (r // * You tried to add a Rule to a WebACL, but the Rule already exists in // the specified WebACL. // -// * You tried to add an IP address to an IPSet, but the IP address already -// exists in the specified IPSet. -// // * You tried to add a ByteMatchTuple to a ByteMatchSet, but the ByteMatchTuple // already exists in the specified WebACL. // @@ -8211,6 +8594,8 @@ func (c *WAFRegional) UpdateSizeConstraintSetRequest(input *waf.UpdateSizeConstr // of the request body are not supported because the AWS resource forwards // only the first 8192 bytes of your request to AWS WAF. // +// You can only specify a single type of TextTransformation. +// // * A ComparisonOperator used for evaluating the selected part of the request // against the specified Size, such as equals, greater than, less than, and // so on. @@ -8271,9 +8656,6 @@ func (c *WAFRegional) UpdateSizeConstraintSetRequest(input *waf.UpdateSizeConstr // * You tried to add a Rule to a WebACL, but the Rule already exists in // the specified WebACL. // -// * You tried to add an IP address to an IPSet, but the IP address already -// exists in the specified IPSet. -// // * You tried to add a ByteMatchTuple to a ByteMatchSet, but the ByteMatchTuple // already exists in the specified WebACL. // @@ -8413,12 +8795,15 @@ func (c *WAFRegional) UpdateSqlInjectionMatchSetRequest(input *waf.UpdateSqlInje // object and add a new one. // // * FieldToMatch: The part of web requests that you want AWS WAF to inspect -// and, if you want AWS WAF to inspect a header, the name of the header. +// and, if you want AWS WAF to inspect a header or custom query parameter, +// the name of the header or parameter. // // * TextTransformation: Which text transformation, if any, to perform on // the web request before inspecting the request for snippets of malicious // SQL code. // +// You can only specify a single type of TextTransformation. +// // You use SqlInjectionMatchSet objects to specify which CloudFront requests // you want to allow, block, or count. For example, if you're receiving requests // that contain snippets of SQL code in the query string and you want to block @@ -8469,9 +8854,6 @@ func (c *WAFRegional) UpdateSqlInjectionMatchSetRequest(input *waf.UpdateSqlInje // * You tried to add a Rule to a WebACL, but the Rule already exists in // the specified WebACL. // -// * You tried to add an IP address to an IPSet, but the IP address already -// exists in the specified IPSet. -// // * You tried to add a ByteMatchTuple to a ByteMatchSet, but the ByteMatchTuple // already exists in the specified WebACL. // @@ -8683,9 +9065,6 @@ func (c *WAFRegional) UpdateWebACLRequest(input *waf.UpdateWebACLInput) (req *re // * You tried to add a Rule to a WebACL, but the Rule already exists in // the specified WebACL. // -// * You tried to add an IP address to an IPSet, but the IP address already -// exists in the specified IPSet. -// // * You tried to add a ByteMatchTuple to a ByteMatchSet, but the ByteMatchTuple // already exists in the specified WebACL. // @@ -8828,12 +9207,15 @@ func (c *WAFRegional) UpdateXssMatchSetRequest(input *waf.UpdateXssMatchSetInput // add a new one. // // * FieldToMatch: The part of web requests that you want AWS WAF to inspect -// and, if you want AWS WAF to inspect a header, the name of the header. +// and, if you want AWS WAF to inspect a header or custom query parameter, +// the name of the header or parameter. // // * TextTransformation: Which text transformation, if any, to perform on // the web request before inspecting the request for cross-site scripting // attacks. // +// You can only specify a single type of TextTransformation. +// // You use XssMatchSet objects to specify which CloudFront requests you want // to allow, block, or count. For example, if you're receiving requests that // contain cross-site scripting attacks in the request body and you want to @@ -8884,9 +9266,6 @@ func (c *WAFRegional) UpdateXssMatchSetRequest(input *waf.UpdateXssMatchSetInput // * You tried to add a Rule to a WebACL, but the Rule already exists in // the specified WebACL. // -// * You tried to add an IP address to an IPSet, but the IP address already -// exists in the specified IPSet. -// // * You tried to add a ByteMatchTuple to a ByteMatchSet, but the ByteMatchTuple // already exists in the specified WebACL. // @@ -10046,6 +10425,12 @@ const ( // MatchFieldTypeBody is a MatchFieldType enum value MatchFieldTypeBody = "BODY" + + // MatchFieldTypeSingleQueryArg is a MatchFieldType enum value + MatchFieldTypeSingleQueryArg = "SINGLE_QUERY_ARG" + + // MatchFieldTypeAllQueryArgs is a MatchFieldType enum value + MatchFieldTypeAllQueryArgs = "ALL_QUERY_ARGS" ) const ( diff --git a/vendor/github.com/aws/aws-sdk-go/service/wafregional/errors.go b/vendor/github.com/aws/aws-sdk-go/service/wafregional/errors.go index 793dbc2fcae..fed17a99181 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/wafregional/errors.go +++ b/vendor/github.com/aws/aws-sdk-go/service/wafregional/errors.go @@ -41,9 +41,6 @@ const ( // * You tried to add a Rule to a WebACL, but the Rule already exists in // the specified WebACL. // - // * You tried to add an IP address to an IPSet, but the IP address already - // exists in the specified IPSet. - // // * You tried to add a ByteMatchTuple to a ByteMatchSet, but the ByteMatchTuple // already exists in the specified WebACL. ErrCodeWAFInvalidOperationException = "WAFInvalidOperationException" @@ -93,8 +90,9 @@ const ( // // * Effect must specify Allow. // - // * The Action in the policy must be waf:UpdateWebACL or waf-regional:UpdateWebACL. - // Any extra or wildcard actions in the policy will be rejected. + // * The Action in the policy must be waf:UpdateWebACL, waf-regional:UpdateWebACL, + // waf:GetRuleGroup and waf-regional:GetRuleGroup . Any extra or wildcard + // actions in the policy will be rejected. // // * The policy cannot include a Resource parameter. // diff --git a/vendor/vendor.json b/vendor/vendor.json index f47ca6f5661..e4a8e464ad4 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -39,1020 +39,1020 @@ "revisionTime": "2017-07-27T15:54:43Z" }, { - "checksumSHA1": "HULJqYLUc6/Qx7ru4PrJwd+MuKQ=", + "checksumSHA1": "qO2na7vGPve58xAwBJziIc+BJb4=", "path": "github.com/aws/aws-sdk-go/aws", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "DtuTqKH29YnLjrIJkRYX0HQtXY0=", "path": "github.com/aws/aws-sdk-go/aws/arn", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "Y9W+4GimK4Fuxq+vyIskVYFRnX4=", "path": "github.com/aws/aws-sdk-go/aws/awserr", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "yyYr41HZ1Aq0hWc3J5ijXwYEcac=", "path": "github.com/aws/aws-sdk-go/aws/awsutil", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "EwL79Cq6euk+EV/t/n2E+jzPNmU=", "path": "github.com/aws/aws-sdk-go/aws/client", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "uEJU4I6dTKaraQKvrljlYKUZwoc=", "path": "github.com/aws/aws-sdk-go/aws/client/metadata", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "vVSUnICaD9IaBQisCfw0n8zLwig=", "path": "github.com/aws/aws-sdk-go/aws/corehandlers", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "I87y3G8r14yKZQ5NlkupFUJ5jW0=", "path": "github.com/aws/aws-sdk-go/aws/credentials", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "JTilCBYWVAfhbKSnrxCNhE8IFns=", "path": "github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "NUJUTWlc1sV8b7WjfiYc4JZbXl0=", "path": "github.com/aws/aws-sdk-go/aws/credentials/endpointcreds", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "JEYqmF83O5n5bHkupAzA6STm0no=", "path": "github.com/aws/aws-sdk-go/aws/credentials/stscreds", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "eI5TmiOTCFjEUNvWeceFycs9dRU=", "path": "github.com/aws/aws-sdk-go/aws/csm", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "6DRhqSAN7O45gYfRIpwDeuJE8j8=", "path": "github.com/aws/aws-sdk-go/aws/defaults", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "uPkjJo+J10vbEukYYXmf0w7Cn4Q=", "path": "github.com/aws/aws-sdk-go/aws/ec2metadata", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { - "checksumSHA1": "r62WcUmf2YEqmAu1QwytNo8gn+g=", + "checksumSHA1": "gbuyBRQ+CdbJrzAx+nRNMbPvW7k=", "path": "github.com/aws/aws-sdk-go/aws/endpoints", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "Ia/AZ2fZp7J4lMO6fpkvfLU/HGY=", "path": "github.com/aws/aws-sdk-go/aws/request", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "zx1mZCdOwgbjBV3jMfb0kyDd//Q=", "path": "github.com/aws/aws-sdk-go/aws/session", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "Dj9WOMBPbboyUJV4GB99PwPcO4g=", "path": "github.com/aws/aws-sdk-go/aws/signer/v4", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "wjxQlU1PYxrDRFoL1Vek8Wch7jk=", "path": "github.com/aws/aws-sdk-go/internal/sdkio", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "MYLldFRnsZh21TfCkgkXCT3maPU=", "path": "github.com/aws/aws-sdk-go/internal/sdkrand", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "tQVg7Sz2zv+KkhbiXxPH0mh9spg=", "path": "github.com/aws/aws-sdk-go/internal/sdkuri", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "04ypv4x12l4q0TksA1zEVsmgpvw=", "path": "github.com/aws/aws-sdk-go/internal/shareddefaults", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "ZX5QHZb0PrK4UF45um2kaAEiX+8=", "path": "github.com/aws/aws-sdk-go/private/protocol", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "GQuRJY72iGQrufDqIaB50zG27u0=", "path": "github.com/aws/aws-sdk-go/private/protocol/ec2query", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "stsUCJVnZ5yMrmzSExbjbYp5tZ8=", "path": "github.com/aws/aws-sdk-go/private/protocol/eventstream", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "bOQjEfKXaTqe7dZhDDER/wZUzQc=", "path": "github.com/aws/aws-sdk-go/private/protocol/eventstream/eventstreamapi", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "CTsp/h3FbFg9QizH4bH1abLwljg=", "path": "github.com/aws/aws-sdk-go/private/protocol/json/jsonutil", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "R00RL5jJXRYq1iiK1+PGvMfvXyM=", "path": "github.com/aws/aws-sdk-go/private/protocol/jsonrpc", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "SBBVYdLcocjdPzMWgDuR8vcOfDQ=", "path": "github.com/aws/aws-sdk-go/private/protocol/query", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "+O6A945eTP9plLpkEMZB0lwBAcg=", "path": "github.com/aws/aws-sdk-go/private/protocol/query/queryutil", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "uRvmEPKcEdv7qc0Ep2zn0E3Xumc=", "path": "github.com/aws/aws-sdk-go/private/protocol/rest", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "Rpu8KBtHZgvhkwHxUfaky+qW+G4=", "path": "github.com/aws/aws-sdk-go/private/protocol/restjson", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "ODo+ko8D6unAxZuN1jGzMcN4QCc=", "path": "github.com/aws/aws-sdk-go/private/protocol/restxml", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "soXVJWQ/xvEB72Mo6FresaQIxLg=", "path": "github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "F6mth+G7dXN1GI+nktaGo8Lx8aE=", "path": "github.com/aws/aws-sdk-go/private/signer/v2", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "4xFqSOZkwDKot6FJQQgKjhJFoQw=", "path": "github.com/aws/aws-sdk-go/service/acm", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "3e/4A/8NqTOSXEtJ6KhYAqqWnuY=", "path": "github.com/aws/aws-sdk-go/service/acmpca", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "FjnLIflNek7g0j5NKT3qFkNtdY8=", "path": "github.com/aws/aws-sdk-go/service/apigateway", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "K/ynSj/L2OzW+9Zqs2PRe8NzYUc=", "path": "github.com/aws/aws-sdk-go/service/applicationautoscaling", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "owhfVKeKxjXt4P5KO6PSIjnMLIA=", "path": "github.com/aws/aws-sdk-go/service/appsync", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "3JN52M5wxJMazxQWXB4epL78LNQ=", "path": "github.com/aws/aws-sdk-go/service/athena", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "P2+Mby00TG2KXcfhiVoNoqIT1Kc=", "path": "github.com/aws/aws-sdk-go/service/autoscaling", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "42OCpXRErVgOtgPsuTrdg7y++TA=", "path": "github.com/aws/aws-sdk-go/service/batch", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "kPYTVg109H4HL8CKEf1yQvwKMw4=", "path": "github.com/aws/aws-sdk-go/service/budgets", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "GhANcrglYWrhNSR/NzxNe3jClMk=", "path": "github.com/aws/aws-sdk-go/service/cloud9", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "HmZRIixQ6u+zMz2Qt0iTU42WVZU=", "path": "github.com/aws/aws-sdk-go/service/cloudformation", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "1nPdiFsBAEdm+vd7Kk4+8Lx55jw=", "path": "github.com/aws/aws-sdk-go/service/cloudfront", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "iFvc4+KfDeQHigAz2+TmogG1Y7M=", "path": "github.com/aws/aws-sdk-go/service/cloudhsmv2", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "1uyTJ/RTr7c8uL2Kbrp+60PE40M=", "path": "github.com/aws/aws-sdk-go/service/cloudsearch", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "3q2FBK4CEarGbVeLCuuX+g1E3jk=", "path": "github.com/aws/aws-sdk-go/service/cloudtrail", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "o+DFxugR5Cy/Wwlv7GSRRilTW4o=", "path": "github.com/aws/aws-sdk-go/service/cloudwatch", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "bbsROEsQ5BI5F2k8qiArbrpgH94=", "path": "github.com/aws/aws-sdk-go/service/cloudwatchevents", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "nGSD4idK9hW8o3U4gLGLESYCpwE=", "path": "github.com/aws/aws-sdk-go/service/cloudwatchlogs", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { - "checksumSHA1": "SfdREjSJPmW+OjKCjwD8m07wT+w=", + "checksumSHA1": "D3p9zRPfvqPBDBVGCCVG2wgYh38=", "path": "github.com/aws/aws-sdk-go/service/codebuild", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "ysSU5yhqWT4+deQUYZiI8/1tJ2c=", "path": "github.com/aws/aws-sdk-go/service/codecommit", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "GvjVVg5btXuEFEHqyoe19BZogGw=", "path": "github.com/aws/aws-sdk-go/service/codedeploy", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "vklitYIK0AiOXA0obSTq0c04pc4=", "path": "github.com/aws/aws-sdk-go/service/codepipeline", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "rL0O6L1zSJ/UQE0kEWUoCOOFDog=", "path": "github.com/aws/aws-sdk-go/service/cognitoidentity", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "gkmRw2ZP/uU+V3b9v7CQM0CA0xs=", "path": "github.com/aws/aws-sdk-go/service/cognitoidentityprovider", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "o9WTZk66Jlu+0UdO1wmtO3qp8ps=", "path": "github.com/aws/aws-sdk-go/service/configservice", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "/y7nXSnR9OqMoxlIl1hFcCk5kT8=", "path": "github.com/aws/aws-sdk-go/service/databasemigrationservice", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "TWva9VAs3zgU/FQjJkiUvY3wIXw=", "path": "github.com/aws/aws-sdk-go/service/dax", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "LfJ0Owy9HyaulKTvDEgCdkChMG8=", "path": "github.com/aws/aws-sdk-go/service/devicefarm", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "PBdPTvba1Ci9LrAs0VExIAWtdKQ=", "path": "github.com/aws/aws-sdk-go/service/directconnect", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "a02+OXxnVBBBeaZpgs8dXUHj8b0=", "path": "github.com/aws/aws-sdk-go/service/directoryservice", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "xoFqND2spsYdyoui+wKepfGQS8c=", "path": "github.com/aws/aws-sdk-go/service/dlm", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "XRzDF1GFEnm7CWURxz8oirdEty4=", "path": "github.com/aws/aws-sdk-go/service/dynamodb", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "QutiSGcdlnEisOq+KNZ872PAl7I=", "path": "github.com/aws/aws-sdk-go/service/ec2", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "VD7bAh0n/UgOwRBPe5y38Ow/dHU=", "path": "github.com/aws/aws-sdk-go/service/ecr", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "Q8RuvleYpFO1hlm/eKRbg5wG/nQ=", "path": "github.com/aws/aws-sdk-go/service/ecs", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "NDrEwIZeUSlHgENwBzVdy0KcCCY=", "path": "github.com/aws/aws-sdk-go/service/efs", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { - "checksumSHA1": "5QdblYPoDtRsQ8aczXOesIKTDpc=", + "checksumSHA1": "dSndJIyIFwpciskUn2ZmUvIdR+c=", "path": "github.com/aws/aws-sdk-go/service/eks", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "kvsll2DfqS1hg97xSWMIcMan5as=", "path": "github.com/aws/aws-sdk-go/service/elasticache", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "G1BmSThB0eTjq8gSfjA+PnB9zs0=", "path": "github.com/aws/aws-sdk-go/service/elasticbeanstalk", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "O++z0DZj/MzSNWgVfV+SYzTS/fM=", "path": "github.com/aws/aws-sdk-go/service/elasticsearchservice", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "VFjWDQMsGpFMrNfcc//ABRpo6Ew=", "path": "github.com/aws/aws-sdk-go/service/elastictranscoder", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "Gp+QZjtg8PCNVi9X8m2SqtFvMas=", "path": "github.com/aws/aws-sdk-go/service/elb", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "wIiqI9GFAV2AQ32o2kEYHNyqVig=", "path": "github.com/aws/aws-sdk-go/service/elbv2", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "oNOLs79R42Vsj/jYTYtrbyTWxcw=", "path": "github.com/aws/aws-sdk-go/service/emr", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "3hICqVOs1WmluYMZN9fTMbDQSyM=", "path": "github.com/aws/aws-sdk-go/service/firehose", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "tNVmAgvnURWLWibVCL7vIDYU7UM=", "path": "github.com/aws/aws-sdk-go/service/fms", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "J1SHh0J6kX8JBD0+TQCFP+1Kij4=", "path": "github.com/aws/aws-sdk-go/service/gamelift", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "BB3/VzUU5Rg4KgrezJ17D4kCnwA=", "path": "github.com/aws/aws-sdk-go/service/glacier", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "A1E5569KvbsmoB9/eA0YxBYmjMI=", "path": "github.com/aws/aws-sdk-go/service/glue", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "HNndTio5+fNOiLr23i+QZpPp8HU=", "path": "github.com/aws/aws-sdk-go/service/guardduty", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "ae+jhUirSvN0IXPVU7X7xc+EbFE=", "path": "github.com/aws/aws-sdk-go/service/iam", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "39yMWxFP9XB+8wWWCZX4vkNWmxU=", "path": "github.com/aws/aws-sdk-go/service/inspector", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { - "checksumSHA1": "L4/CAGbD5ka9byuE1EC6EDGCIxc=", + "checksumSHA1": "G1GZpCmKREPPgzLOBrvXmiyhbnc=", "path": "github.com/aws/aws-sdk-go/service/iot", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "q9HZ/0/lBSRKtjHXMegmcRcazPo=", "path": "github.com/aws/aws-sdk-go/service/kinesis", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "nUdxsOW9jg+m+sWZYPu7oX9rZo8=", "path": "github.com/aws/aws-sdk-go/service/kinesisanalytics", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "vaMnUnRVDkpHp/e4f3dFX20JblM=", "path": "github.com/aws/aws-sdk-go/service/kms", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "K4OamITKC7PKo1eHrSl0z8Visg0=", "path": "github.com/aws/aws-sdk-go/service/lambda", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "nMklVJilxMmhlmnnquFJB97isMk=", "path": "github.com/aws/aws-sdk-go/service/lexmodelbuildingservice", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "tX/3xEkl13DuKNIO0v3qYseEIvI=", "path": "github.com/aws/aws-sdk-go/service/lightsail", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "+l6bA5aVzmBXH2Isj1xZkd5RKNY=", "path": "github.com/aws/aws-sdk-go/service/macie", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "WfsMSOC0DxRApVecptw2244Cc6w=", "path": "github.com/aws/aws-sdk-go/service/mediaconvert", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "PE3129yEUwSvn0rg3P86Pxqnnps=", "path": "github.com/aws/aws-sdk-go/service/medialive", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { - "checksumSHA1": "CggySAQfK9WXsX37mRI8UqXGkJo=", + "checksumSHA1": "4YkW/odfpvJHVz5p2RCW3cWaHOQ=", "path": "github.com/aws/aws-sdk-go/service/mediapackage", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "9NU6dJOvKvcgnl/4eUdwy4YD5ss=", "path": "github.com/aws/aws-sdk-go/service/mediastore", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "qyIVtaN5mzPq4d7BDj9YpYtifKs=", "path": "github.com/aws/aws-sdk-go/service/mediastoredata", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "1jKxCBvS+zKzq6p2i4BqLXYHm48=", "path": "github.com/aws/aws-sdk-go/service/mq", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "E3i2/WM1kDE7WBOSRnDsZkwmZwI=", "path": "github.com/aws/aws-sdk-go/service/neptune", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "x3PsW91a7fh+Q466y3WM3fdtnGg=", "path": "github.com/aws/aws-sdk-go/service/opsworks", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "YCd2EU1DPiO0QTRZk6G1fLZAyg0=", "path": "github.com/aws/aws-sdk-go/service/organizations", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "e5v4Cc9/0H2ngQNuvVyj2Mt0vi0=", "path": "github.com/aws/aws-sdk-go/service/pinpoint", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "j1i1tZ94/kDvvzgpv5xqxwNvgyY=", "path": "github.com/aws/aws-sdk-go/service/pricing", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "EvlN1OFs7c7kQEIuvkwE/yTuv8o=", "path": "github.com/aws/aws-sdk-go/service/rds", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { - "checksumSHA1": "N/wIyWWN2g8QcyCJQLTDoFxaoLk=", + "checksumSHA1": "1zThqt8de3tv6wOzT/8mKxqJ5kE=", "path": "github.com/aws/aws-sdk-go/service/redshift", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "KlM6azZ5G09MmPg+lzEizW2qaLA=", "path": "github.com/aws/aws-sdk-go/service/route53", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "DmKatmbYsvm+MoCP01PCdQ6Y6Tk=", "path": "github.com/aws/aws-sdk-go/service/s3", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { - "checksumSHA1": "b6/blG8OZ6+RRIX6fuMSCeaqNsk=", + "checksumSHA1": "qB34t8+gQAYbx7kaxDIllgM9MpQ=", "path": "github.com/aws/aws-sdk-go/service/sagemaker", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "FkBALtXiN4PCzFnl/G2gXFFLV3E=", "path": "github.com/aws/aws-sdk-go/service/secretsmanager", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "Y29bmjwKXcPg0d0WvZNFGdhd4+E=", "path": "github.com/aws/aws-sdk-go/service/serverlessapplicationrepository", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "T8dOJ1jjEBdogUE03oRPRJCOY3k=", "path": "github.com/aws/aws-sdk-go/service/servicecatalog", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "UhJ0RdPXzdMOUEBWREB5Zi9lgmY=", "path": "github.com/aws/aws-sdk-go/service/servicediscovery", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "0vtFXRYnhlCCq8/zPv1O1YWIoSg=", "path": "github.com/aws/aws-sdk-go/service/ses", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "1rJbvLXRsCzWhTihruRq/i0Zawg=", "path": "github.com/aws/aws-sdk-go/service/sfn", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "hliWYTmov/HswyMpYq93zJtdkk0=", "path": "github.com/aws/aws-sdk-go/service/simpledb", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "bW9FW0Qe3VURaSoY305kA/wCFrM=", "path": "github.com/aws/aws-sdk-go/service/sns", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "ECIZck5xhocpUl8GeUAdeSnCgvg=", "path": "github.com/aws/aws-sdk-go/service/sqs", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "307CISQxMTTnatZ//6/p8obzeGs=", "path": "github.com/aws/aws-sdk-go/service/ssm", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "TeuakooizAybzyMQyTXllUyhfBg=", "path": "github.com/aws/aws-sdk-go/service/storagegateway", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "UhIVLDgQc19wjrPj8pP7Fu2UwWc=", "path": "github.com/aws/aws-sdk-go/service/sts", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "zSqEhiGtEK6ll3f1Rlf2tuDKQA8=", "path": "github.com/aws/aws-sdk-go/service/swf", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { - "checksumSHA1": "H8Pa7irZ9gpuYGJk3uMK59gxGTs=", + "checksumSHA1": "N/w20GqQBU7sVFbshxOA3AWAvDU=", "path": "github.com/aws/aws-sdk-go/service/waf", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { - "checksumSHA1": "uRMuwxPD/AlpvFpKppgAYzvlC0A=", + "checksumSHA1": "ocF/2t8BOrkUpc62h6kHH0WtfTg=", "path": "github.com/aws/aws-sdk-go/service/wafregional", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "oe8l2ibuhzz7fWM3f64cWnHwFy8=", "path": "github.com/aws/aws-sdk-go/service/workspaces", - "revision": "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e", - "revisionTime": "2018-08-25T00:53:30Z", - "version": "v1.15.21", - "versionExact": "v1.15.21" + "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", + "revisionTime": "2018-08-31T22:30:03Z", + "version": "v1.15.26", + "versionExact": "v1.15.26" }, { "checksumSHA1": "yBBHqv7DvZNsZdF00SO8PbEQAKU=", @@ -2136,4 +2136,4 @@ } ], "rootPath": "github.com/terraform-providers/terraform-provider-aws" -} \ No newline at end of file +} From 14a3a280d3e0b61ae24d4f4866aa74bb4dfdb996 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Fri, 31 Aug 2018 19:06:04 -0400 Subject: [PATCH 036/184] vendor: hashicorp/go-uuid@v1.0.0 Preparation for converting to Go modules. * Updated via: `govendor fetch github.com/hashicorp/go-uuid/...@v1.0.0` --- vendor/github.com/hashicorp/go-uuid/README.md | 4 ++-- vendor/github.com/hashicorp/go-uuid/go.mod | 1 + vendor/github.com/hashicorp/go-uuid/uuid.go | 16 ++++++++++++---- vendor/vendor.json | 9 ++++++--- 4 files changed, 21 insertions(+), 9 deletions(-) create mode 100644 vendor/github.com/hashicorp/go-uuid/go.mod diff --git a/vendor/github.com/hashicorp/go-uuid/README.md b/vendor/github.com/hashicorp/go-uuid/README.md index 21fdda4adaf..fbde8b9aef6 100644 --- a/vendor/github.com/hashicorp/go-uuid/README.md +++ b/vendor/github.com/hashicorp/go-uuid/README.md @@ -1,6 +1,6 @@ -# uuid +# uuid [![Build Status](https://travis-ci.org/hashicorp/go-uuid.svg?branch=master)](https://travis-ci.org/hashicorp/go-uuid) -Generates UUID-format strings using purely high quality random bytes. +Generates UUID-format strings using high quality, _purely random_ bytes. It is **not** intended to be RFC compliant, merely to use a well-understood string representation of a 128-bit value. It can also parse UUID-format strings into their component bytes. Documentation ============= diff --git a/vendor/github.com/hashicorp/go-uuid/go.mod b/vendor/github.com/hashicorp/go-uuid/go.mod new file mode 100644 index 00000000000..dd57f9d21ad --- /dev/null +++ b/vendor/github.com/hashicorp/go-uuid/go.mod @@ -0,0 +1 @@ +module github.com/hashicorp/go-uuid diff --git a/vendor/github.com/hashicorp/go-uuid/uuid.go b/vendor/github.com/hashicorp/go-uuid/uuid.go index 322b522c23f..ff9364c4040 100644 --- a/vendor/github.com/hashicorp/go-uuid/uuid.go +++ b/vendor/github.com/hashicorp/go-uuid/uuid.go @@ -6,13 +6,21 @@ import ( "fmt" ) -// GenerateUUID is used to generate a random UUID -func GenerateUUID() (string, error) { - buf := make([]byte, 16) +// GenerateRandomBytes is used to generate random bytes of given size. +func GenerateRandomBytes(size int) ([]byte, error) { + buf := make([]byte, size) if _, err := rand.Read(buf); err != nil { - return "", fmt.Errorf("failed to read random bytes: %v", err) + return nil, fmt.Errorf("failed to read random bytes: %v", err) } + return buf, nil +} +// GenerateUUID is used to generate a random UUID +func GenerateUUID() (string, error) { + buf, err := GenerateRandomBytes(16) + if err != nil { + return "", err + } return FormatUUID(buf) } diff --git a/vendor/vendor.json b/vendor/vendor.json index f47ca6f5661..e46ab8f2142 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -1182,9 +1182,12 @@ "revisionTime": "2018-03-26T21:11:50Z" }, { - "checksumSHA1": "85XUnluYJL7F55ptcwdmN8eSOsk=", + "checksumSHA1": "Kjansj6ZDJrWKNS1BJpg+z7OBnI=", "path": "github.com/hashicorp/go-uuid", - "revision": "36289988d83ca270bc07c234c36f364b0dd9c9a7" + "revision": "de160f5c59f693fed329e73e291bb751fe4ea4dc", + "revisionTime": "2018-08-30T03:27:00Z", + "version": "v1.0.0", + "versionExact": "v1.0.0" }, { "checksumSHA1": "r0pj5dMHCghpaQZ3f1BRGoKiSWw=", @@ -2136,4 +2139,4 @@ } ], "rootPath": "github.com/terraform-providers/terraform-provider-aws" -} \ No newline at end of file +} From 185bccbba1c4d491a9aef18ba580a22e402a6513 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Fri, 31 Aug 2018 19:11:22 -0400 Subject: [PATCH 037/184] vendor: hashicorp/go-cleanhttp@v0.5.0 Preparation for migrating to Go modules. Notable change: `net.Dailer` has `DualStack` enabled. Documentation: https://golang.org/pkg/net/#Dialer ``` // DualStack enables RFC 6555-compliant "Happy Eyeballs" // dialing when the network is "tcp" and the host in the // address parameter resolves to both IPv4 and IPv6 addresses. // This allows a client to tolerate networks where one address // family is silently broken. DualStack bool ``` * Updated via `govendor fetch github.com/hashicorp/go-cleanhttp/...@v0.5.0` --- .../hashicorp/go-cleanhttp/cleanhttp.go | 1 + .../github.com/hashicorp/go-cleanhttp/go.mod | 1 + .../hashicorp/go-cleanhttp/handlers.go | 43 +++++++++++++++++++ vendor/vendor.json | 10 +++-- 4 files changed, 51 insertions(+), 4 deletions(-) create mode 100644 vendor/github.com/hashicorp/go-cleanhttp/go.mod create mode 100644 vendor/github.com/hashicorp/go-cleanhttp/handlers.go diff --git a/vendor/github.com/hashicorp/go-cleanhttp/cleanhttp.go b/vendor/github.com/hashicorp/go-cleanhttp/cleanhttp.go index 7d8a57c2807..8d306bf5134 100644 --- a/vendor/github.com/hashicorp/go-cleanhttp/cleanhttp.go +++ b/vendor/github.com/hashicorp/go-cleanhttp/cleanhttp.go @@ -26,6 +26,7 @@ func DefaultPooledTransport() *http.Transport { DialContext: (&net.Dialer{ Timeout: 30 * time.Second, KeepAlive: 30 * time.Second, + DualStack: true, }).DialContext, MaxIdleConns: 100, IdleConnTimeout: 90 * time.Second, diff --git a/vendor/github.com/hashicorp/go-cleanhttp/go.mod b/vendor/github.com/hashicorp/go-cleanhttp/go.mod new file mode 100644 index 00000000000..310f07569fc --- /dev/null +++ b/vendor/github.com/hashicorp/go-cleanhttp/go.mod @@ -0,0 +1 @@ +module github.com/hashicorp/go-cleanhttp diff --git a/vendor/github.com/hashicorp/go-cleanhttp/handlers.go b/vendor/github.com/hashicorp/go-cleanhttp/handlers.go new file mode 100644 index 00000000000..7eda3777f3c --- /dev/null +++ b/vendor/github.com/hashicorp/go-cleanhttp/handlers.go @@ -0,0 +1,43 @@ +package cleanhttp + +import ( + "net/http" + "strings" + "unicode" +) + +// HandlerInput provides input options to cleanhttp's handlers +type HandlerInput struct { + ErrStatus int +} + +// PrintablePathCheckHandler is a middleware that ensures the request path +// contains only printable runes. +func PrintablePathCheckHandler(next http.Handler, input *HandlerInput) http.Handler { + // Nil-check on input to make it optional + if input == nil { + input = &HandlerInput{ + ErrStatus: http.StatusBadRequest, + } + } + + // Default to http.StatusBadRequest on error + if input.ErrStatus == 0 { + input.ErrStatus = http.StatusBadRequest + } + + return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + // Check URL path for non-printable characters + idx := strings.IndexFunc(r.URL.Path, func(c rune) bool { + return !unicode.IsPrint(c) + }) + + if idx != -1 { + w.WriteHeader(input.ErrStatus) + return + } + + next.ServeHTTP(w, r) + return + }) +} diff --git a/vendor/vendor.json b/vendor/vendor.json index f47ca6f5661..2eb40a1e60e 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -1140,10 +1140,12 @@ "revision": "7554cd9344cec97297fa6649b055a8c98c2a1e55" }, { - "checksumSHA1": "b8F628srIitj5p7Y130xc9k0QWs=", + "checksumSHA1": "Ihile6rE76J6SivxECovHgMROxw=", "path": "github.com/hashicorp/go-cleanhttp", - "revision": "3573b8b52aa7b37b9358d966a898feb387f62437", - "revisionTime": "2017-02-11T01:34:15Z" + "revision": "e8ab9daed8d1ddd2d3c4efba338fe2eeae2e4f18", + "revisionTime": "2018-08-30T03:37:06Z", + "version": "v0.5.0", + "versionExact": "v0.5.0" }, { "checksumSHA1": "fvjFEz5PBN1m9ALWf9UuLgTFWLg=", @@ -2136,4 +2138,4 @@ } ], "rootPath": "github.com/terraform-providers/terraform-provider-aws" -} \ No newline at end of file +} From a1444f2b6402623dcbe2737bcc5785e7900ad008 Mon Sep 17 00:00:00 2001 From: Miguel David Date: Sun, 2 Sep 2018 20:13:50 +0100 Subject: [PATCH 038/184] Add example of credit specification block syntax --- website/docs/r/instance.html.markdown | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/website/docs/r/instance.html.markdown b/website/docs/r/instance.html.markdown index 4410345445b..80b17882427 100644 --- a/website/docs/r/instance.html.markdown +++ b/website/docs/r/instance.html.markdown @@ -226,11 +226,14 @@ resource "aws_network_interface" "foo" { } resource "aws_instance" "foo" { - ami = "ami-22b9a343" # us-west-2 - instance_type = "t2.micro" - network_interface { - network_interface_id = "${aws_network_interface.foo.id}" - device_index = 0 + ami = "ami-22b9a343" # us-west-2 + instance_type = "t2.micro" + network_interface { + network_interface_id = "${aws_network_interface.foo.id}" + device_index = 0 + } + credit_specification { + cpu_credits = "unlimited" } } ``` From a19b569428c0262f0fedeade8b2f1ea60d7d648e Mon Sep 17 00:00:00 2001 From: Victor Turbinsky Date: Sun, 2 Sep 2018 22:42:07 +0100 Subject: [PATCH 039/184] Fix: Added ForceNew for aws_redshift_cluster on availability_zone change --- aws/resource_aws_redshift_cluster.go | 1 + aws/resource_aws_redshift_cluster_test.go | 57 +++++++++++++++++++++++ 2 files changed, 58 insertions(+) diff --git a/aws/resource_aws_redshift_cluster.go b/aws/resource_aws_redshift_cluster.go index 9f6c99ee3cf..54123514d8b 100644 --- a/aws/resource_aws_redshift_cluster.go +++ b/aws/resource_aws_redshift_cluster.go @@ -90,6 +90,7 @@ func resourceAwsRedshiftCluster() *schema.Resource { "availability_zone": { Type: schema.TypeString, Optional: true, + ForceNew: true, Computed: true, }, diff --git a/aws/resource_aws_redshift_cluster_test.go b/aws/resource_aws_redshift_cluster_test.go index 3865e8e5f4a..9fc2b1e72f9 100644 --- a/aws/resource_aws_redshift_cluster_test.go +++ b/aws/resource_aws_redshift_cluster_test.go @@ -504,6 +504,39 @@ func TestAccAWSRedshiftCluster_forceNewUsername(t *testing.T) { }) } +func TestAccAWSRedshiftCluster_changeAvailabilityZone(t *testing.T) { + var first, second redshift.Cluster + + ri := acctest.RandInt() + preConfig := testAccAWSRedshiftClusterConfig_basic(ri) + postConfig := testAccAWSRedshiftClusterConfig_updatedAvailabilityZone(ri) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSRedshiftClusterDestroy, + Steps: []resource.TestStep{ + { + Config: preConfig, + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSRedshiftClusterExists("aws_redshift_cluster.default", &first), + testAccCheckAWSRedshiftClusterAvailabilityZone(&first, "us-west-2a"), + resource.TestCheckResourceAttr("aws_redshift_cluster.default", "availability_zone", "us-west-2a"), + ), + }, + + { + Config: postConfig, + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSRedshiftClusterExists("aws_redshift_cluster.default", &second), + testAccCheckAWSRedshiftClusterAvailabilityZone(&second, "us-west-2b"), + resource.TestCheckResourceAttr("aws_redshift_cluster.default", "availability_zone", "us-west-2b"), + ), + }, + }, + }) +} + func testAccCheckAWSRedshiftClusterDestroy(s *terraform.State) error { for _, rs := range s.RootModule().Resources { if rs.Type != "aws_redshift_cluster" { @@ -629,6 +662,15 @@ func testAccCheckAWSRedshiftClusterMasterUsername(c *redshift.Cluster, value str } } +func testAccCheckAWSRedshiftClusterAvailabilityZone(c *redshift.Cluster, value string) resource.TestCheckFunc { + return func(s *terraform.State) error { + if *c.AvailabilityZone != value { + return fmt.Errorf("Expected cluster's AvailabilityZone: %q, given: %q", value, *c.AvailabilityZone) + } + return nil + } +} + func TestResourceAWSRedshiftClusterIdentifierValidation(t *testing.T) { cases := []struct { Value string @@ -1304,3 +1346,18 @@ resource "aws_redshift_cluster" "default" { skip_final_snapshot = true }`, rInt) } + +func testAccAWSRedshiftClusterConfig_updatedAvailabilityZone(rInt int) string { + return fmt.Sprintf(` + resource "aws_redshift_cluster" "default" { + cluster_identifier = "tf-redshift-cluster-%d" + availability_zone = "us-west-2b" + database_name = "mydb" + master_username = "foo_test" + master_password = "Mustbe8characters" + node_type = "dc1.large" + automated_snapshot_retention_period = 0 + allow_version_upgrade = false + skip_final_snapshot = true + }`, rInt) +} From 73c6d10b46e20179efe67003792bba1dddf52537 Mon Sep 17 00:00:00 2001 From: saravanan30erd Date: Mon, 3 Sep 2018 12:47:02 +0400 Subject: [PATCH 040/184] fix the gofmt issues --- ...a_source_aws_cloudformation_export_test.go | 2 +- aws/opsworks_layers.go | 24 +++++++-------- ...source_aws_acmpca_certificate_authority.go | 6 ++-- aws/resource_aws_api_gateway_integration.go | 30 +++++++++---------- ...e_aws_cloudfront_origin_access_identity.go | 4 +-- ...ce_aws_codedeploy_deployment_group_test.go | 8 ++--- aws/resource_aws_db_instance.go | 2 +- aws/resource_aws_db_security_group.go | 2 +- aws/resource_aws_dms_replication_instance.go | 2 +- ...sticache_replication_group_migrate_test.go | 2 +- ...resource_aws_emr_security_configuration.go | 2 +- aws/resource_aws_gamelift_fleet.go | 10 +++---- aws/resource_aws_instance.go | 12 ++++---- aws/resource_aws_instance_migrate_test.go | 8 ++--- ...ce_aws_kinesis_firehose_delivery_stream.go | 10 +++---- aws/resource_aws_neptune_cluster_instance.go | 2 +- ...rce_aws_neptune_cluster_parameter_group.go | 2 +- aws/resource_aws_rds_cluster_instance.go | 2 +- ...esource_aws_rds_cluster_parameter_group.go | 2 +- aws/resource_aws_redshift_cluster.go | 2 +- aws/resource_aws_route53_record.go | 4 +-- aws/resource_aws_s3_bucket.go | 4 +-- aws/resource_aws_s3_bucket_inventory.go | 4 +-- aws/resource_aws_s3_bucket_notification.go | 4 +-- ...esource_aws_security_group_migrate_test.go | 2 +- ..._service_discovery_service_migrate_test.go | 4 +-- aws/resource_aws_sns_topic.go | 8 ++--- aws/resource_aws_spot_fleet_request.go | 2 +- aws/resource_aws_spot_instance_request.go | 4 +-- aws/resource_aws_ssm_maintenance_window.go | 8 ++--- aws/resource_aws_ssm_patch_baseline.go | 2 +- aws/resource_aws_swf_domain.go | 2 +- aws/resource_aws_vpc.go | 2 +- aws/validators_test.go | 16 +++++----- 34 files changed, 100 insertions(+), 100 deletions(-) diff --git a/aws/data_source_aws_cloudformation_export_test.go b/aws/data_source_aws_cloudformation_export_test.go index 1ca42d7bc43..e76f91e20b0 100644 --- a/aws/data_source_aws_cloudformation_export_test.go +++ b/aws/data_source_aws_cloudformation_export_test.go @@ -17,7 +17,7 @@ func TestAccAWSCloudformationExportDataSource_basic(t *testing.T) { Providers: testAccProviders, Steps: []resource.TestStep{ { - Config: testAccCheckAwsCloudformationExportConfig(rName), + Config: testAccCheckAwsCloudformationExportConfig(rName), PreventPostDestroyRefresh: true, Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttr("data.aws_cloudformation_export.waiter", "value", "waiter"), diff --git a/aws/opsworks_layers.go b/aws/opsworks_layers.go index d33eab61ca2..83e0b2d0284 100644 --- a/aws/opsworks_layers.go +++ b/aws/opsworks_layers.go @@ -345,13 +345,13 @@ func (lt *opsworksLayerType) Create(d *schema.ResourceData, client *opsworks.Ops EnableAutoHealing: aws.Bool(d.Get("auto_healing").(bool)), InstallUpdatesOnBoot: aws.Bool(d.Get("install_updates_on_boot").(bool)), LifecycleEventConfiguration: lt.LifecycleEventConfiguration(d), - Name: aws.String(d.Get("name").(string)), - Packages: expandStringSet(d.Get("system_packages").(*schema.Set)), - Type: aws.String(lt.TypeName), - StackId: aws.String(d.Get("stack_id").(string)), - UseEbsOptimizedInstances: aws.Bool(d.Get("use_ebs_optimized_instances").(bool)), - Attributes: lt.AttributeMap(d), - VolumeConfigurations: lt.VolumeConfigurations(d), + Name: aws.String(d.Get("name").(string)), + Packages: expandStringSet(d.Get("system_packages").(*schema.Set)), + Type: aws.String(lt.TypeName), + StackId: aws.String(d.Get("stack_id").(string)), + UseEbsOptimizedInstances: aws.Bool(d.Get("use_ebs_optimized_instances").(bool)), + Attributes: lt.AttributeMap(d), + VolumeConfigurations: lt.VolumeConfigurations(d), } if lt.CustomShortName { @@ -399,11 +399,11 @@ func (lt *opsworksLayerType) Update(d *schema.ResourceData, client *opsworks.Ops EnableAutoHealing: aws.Bool(d.Get("auto_healing").(bool)), InstallUpdatesOnBoot: aws.Bool(d.Get("install_updates_on_boot").(bool)), LifecycleEventConfiguration: lt.LifecycleEventConfiguration(d), - Name: aws.String(d.Get("name").(string)), - Packages: expandStringSet(d.Get("system_packages").(*schema.Set)), - UseEbsOptimizedInstances: aws.Bool(d.Get("use_ebs_optimized_instances").(bool)), - Attributes: lt.AttributeMap(d), - VolumeConfigurations: lt.VolumeConfigurations(d), + Name: aws.String(d.Get("name").(string)), + Packages: expandStringSet(d.Get("system_packages").(*schema.Set)), + UseEbsOptimizedInstances: aws.Bool(d.Get("use_ebs_optimized_instances").(bool)), + Attributes: lt.AttributeMap(d), + VolumeConfigurations: lt.VolumeConfigurations(d), } if lt.CustomShortName { diff --git a/aws/resource_aws_acmpca_certificate_authority.go b/aws/resource_aws_acmpca_certificate_authority.go index 81bc3479f41..e8158743c68 100644 --- a/aws/resource_aws_acmpca_certificate_authority.go +++ b/aws/resource_aws_acmpca_certificate_authority.go @@ -284,7 +284,7 @@ func resourceAwsAcmpcaCertificateAuthorityCreate(d *schema.ResourceData, meta in if v, ok := d.GetOk("tags"); ok { input := &acmpca.TagCertificateAuthorityInput{ CertificateAuthorityArn: aws.String(d.Id()), - Tags: tagsFromMapACMPCA(v.(map[string]interface{})), + Tags: tagsFromMapACMPCA(v.(map[string]interface{})), } log.Printf("[DEBUG] Tagging ACMPCA Certificate Authority: %s", input) @@ -458,7 +458,7 @@ func resourceAwsAcmpcaCertificateAuthorityUpdate(d *schema.ResourceData, meta in log.Printf("[DEBUG] Removing ACMPCA Certificate Authority %q tags: %#v", d.Id(), remove) _, err := conn.UntagCertificateAuthority(&acmpca.UntagCertificateAuthorityInput{ CertificateAuthorityArn: aws.String(d.Id()), - Tags: remove, + Tags: remove, }) if err != nil { return fmt.Errorf("error updating ACMPCA Certificate Authority %q tags: %s", d.Id(), err) @@ -468,7 +468,7 @@ func resourceAwsAcmpcaCertificateAuthorityUpdate(d *schema.ResourceData, meta in log.Printf("[DEBUG] Creating ACMPCA Certificate Authority %q tags: %#v", d.Id(), create) _, err := conn.TagCertificateAuthority(&acmpca.TagCertificateAuthorityInput{ CertificateAuthorityArn: aws.String(d.Id()), - Tags: create, + Tags: create, }) if err != nil { return fmt.Errorf("error updating ACMPCA Certificate Authority %q tags: %s", d.Id(), err) diff --git a/aws/resource_aws_api_gateway_integration.go b/aws/resource_aws_api_gateway_integration.go index 755bcb54c09..259d5d69136 100644 --- a/aws/resource_aws_api_gateway_integration.go +++ b/aws/resource_aws_api_gateway_integration.go @@ -243,22 +243,22 @@ func resourceAwsApiGatewayIntegrationCreate(d *schema.ResourceData, meta interfa } _, err := conn.PutIntegration(&apigateway.PutIntegrationInput{ - HttpMethod: aws.String(d.Get("http_method").(string)), - ResourceId: aws.String(d.Get("resource_id").(string)), - RestApiId: aws.String(d.Get("rest_api_id").(string)), - Type: aws.String(d.Get("type").(string)), + HttpMethod: aws.String(d.Get("http_method").(string)), + ResourceId: aws.String(d.Get("resource_id").(string)), + RestApiId: aws.String(d.Get("rest_api_id").(string)), + Type: aws.String(d.Get("type").(string)), IntegrationHttpMethod: integrationHttpMethod, - Uri: uri, - RequestParameters: aws.StringMap(parameters), - RequestTemplates: aws.StringMap(templates), - Credentials: credentials, - CacheNamespace: cacheNamespace, - CacheKeyParameters: cacheKeyParameters, - PassthroughBehavior: passthroughBehavior, - ContentHandling: contentHandling, - ConnectionType: connectionType, - ConnectionId: connectionId, - TimeoutInMillis: timeoutInMillis, + Uri: uri, + RequestParameters: aws.StringMap(parameters), + RequestTemplates: aws.StringMap(templates), + Credentials: credentials, + CacheNamespace: cacheNamespace, + CacheKeyParameters: cacheKeyParameters, + PassthroughBehavior: passthroughBehavior, + ContentHandling: contentHandling, + ConnectionType: connectionType, + ConnectionId: connectionId, + TimeoutInMillis: timeoutInMillis, }) if err != nil { return fmt.Errorf("Error creating API Gateway Integration: %s", err) diff --git a/aws/resource_aws_cloudfront_origin_access_identity.go b/aws/resource_aws_cloudfront_origin_access_identity.go index 00f6b65877b..b82296763a9 100644 --- a/aws/resource_aws_cloudfront_origin_access_identity.go +++ b/aws/resource_aws_cloudfront_origin_access_identity.go @@ -95,9 +95,9 @@ func resourceAwsCloudFrontOriginAccessIdentityRead(d *schema.ResourceData, meta func resourceAwsCloudFrontOriginAccessIdentityUpdate(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).cloudfrontconn params := &cloudfront.UpdateCloudFrontOriginAccessIdentityInput{ - Id: aws.String(d.Id()), + Id: aws.String(d.Id()), CloudFrontOriginAccessIdentityConfig: expandOriginAccessIdentityConfig(d), - IfMatch: aws.String(d.Get("etag").(string)), + IfMatch: aws.String(d.Get("etag").(string)), } _, err := conn.UpdateCloudFrontOriginAccessIdentity(params) if err != nil { diff --git a/aws/resource_aws_codedeploy_deployment_group_test.go b/aws/resource_aws_codedeploy_deployment_group_test.go index 1ab89775d09..9f107231c5e 100644 --- a/aws/resource_aws_codedeploy_deployment_group_test.go +++ b/aws/resource_aws_codedeploy_deployment_group_test.go @@ -1568,7 +1568,7 @@ func TestAWSCodeDeployDeploymentGroup_expandBlueGreenDeploymentConfig(t *testing "terminate_blue_instances_on_deployment_success": []interface{}{ map[string]interface{}{ - "action": "TERMINATE", + "action": "TERMINATE", "termination_wait_time_in_minutes": 90, }, }, @@ -1586,7 +1586,7 @@ func TestAWSCodeDeployDeploymentGroup_expandBlueGreenDeploymentConfig(t *testing }, TerminateBlueInstancesOnDeploymentSuccess: &codedeploy.BlueInstanceTerminationOption{ - Action: aws.String("TERMINATE"), + Action: aws.String("TERMINATE"), TerminationWaitTimeInMinutes: aws.Int64(90), }, } @@ -1611,7 +1611,7 @@ func TestAWSCodeDeployDeploymentGroup_flattenBlueGreenDeploymentConfig(t *testin }, TerminateBlueInstancesOnDeploymentSuccess: &codedeploy.BlueInstanceTerminationOption{ - Action: aws.String("KEEP_ALIVE"), + Action: aws.String("KEEP_ALIVE"), TerminationWaitTimeInMinutes: aws.Int64(90), }, } @@ -1632,7 +1632,7 @@ func TestAWSCodeDeployDeploymentGroup_flattenBlueGreenDeploymentConfig(t *testin "terminate_blue_instances_on_deployment_success": []map[string]interface{}{ { - "action": "KEEP_ALIVE", + "action": "KEEP_ALIVE", "termination_wait_time_in_minutes": 90, }, }, diff --git a/aws/resource_aws_db_instance.go b/aws/resource_aws_db_instance.go index 8e44d8703c3..9100d9518dd 100644 --- a/aws/resource_aws_db_instance.go +++ b/aws/resource_aws_db_instance.go @@ -460,7 +460,7 @@ func resourceAwsDbInstanceCreate(d *schema.ResourceData, meta interface{}) error DBInstanceIdentifier: aws.String(identifier), PubliclyAccessible: aws.Bool(d.Get("publicly_accessible").(bool)), SourceDBInstanceIdentifier: aws.String(v.(string)), - Tags: tags, + Tags: tags, } if attr, ok := d.GetOk("allocated_storage"); ok { diff --git a/aws/resource_aws_db_security_group.go b/aws/resource_aws_db_security_group.go index f3bd2617c2f..04d4ef1f9f8 100644 --- a/aws/resource_aws_db_security_group.go +++ b/aws/resource_aws_db_security_group.go @@ -91,7 +91,7 @@ func resourceAwsDbSecurityGroupCreate(d *schema.ResourceData, meta interface{}) opts := rds.CreateDBSecurityGroupInput{ DBSecurityGroupName: aws.String(d.Get("name").(string)), DBSecurityGroupDescription: aws.String(d.Get("description").(string)), - Tags: tags, + Tags: tags, } log.Printf("[DEBUG] DB Security Group create configuration: %#v", opts) diff --git a/aws/resource_aws_dms_replication_instance.go b/aws/resource_aws_dms_replication_instance.go index df12efb91d6..282451a7b0e 100644 --- a/aws/resource_aws_dms_replication_instance.go +++ b/aws/resource_aws_dms_replication_instance.go @@ -136,7 +136,7 @@ func resourceAwsDmsReplicationInstanceCreate(d *schema.ResourceData, meta interf PubliclyAccessible: aws.Bool(d.Get("publicly_accessible").(bool)), ReplicationInstanceClass: aws.String(d.Get("replication_instance_class").(string)), ReplicationInstanceIdentifier: aws.String(d.Get("replication_instance_id").(string)), - Tags: dmsTagsFromMap(d.Get("tags").(map[string]interface{})), + Tags: dmsTagsFromMap(d.Get("tags").(map[string]interface{})), } // WARNING: GetOk returns the zero value for the type if the key is omitted in config. This means for optional diff --git a/aws/resource_aws_elasticache_replication_group_migrate_test.go b/aws/resource_aws_elasticache_replication_group_migrate_test.go index 1379d539a47..c014f7e6d68 100644 --- a/aws/resource_aws_elasticache_replication_group_migrate_test.go +++ b/aws/resource_aws_elasticache_replication_group_migrate_test.go @@ -16,7 +16,7 @@ func TestAwsElasticacheReplicationGroupMigrateState(t *testing.T) { "v0Tov1": { StateVersion: 0, Attributes: map[string]string{ - "cluster_mode.#": "1", + "cluster_mode.#": "1", "cluster_mode.4170186206.num_node_groups": "2", "cluster_mode.4170186206.replicas_per_node_group": "1", }, diff --git a/aws/resource_aws_emr_security_configuration.go b/aws/resource_aws_emr_security_configuration.go index 45beffc6d1a..ff25619a361 100644 --- a/aws/resource_aws_emr_security_configuration.go +++ b/aws/resource_aws_emr_security_configuration.go @@ -65,7 +65,7 @@ func resourceAwsEmrSecurityConfigurationCreate(d *schema.ResourceData, meta inte } resp, err := conn.CreateSecurityConfiguration(&emr.CreateSecurityConfigurationInput{ - Name: aws.String(emrSCName), + Name: aws.String(emrSCName), SecurityConfiguration: aws.String(d.Get("configuration").(string)), }) diff --git a/aws/resource_aws_gamelift_fleet.go b/aws/resource_aws_gamelift_fleet.go index be1a328daab..815b899d716 100644 --- a/aws/resource_aws_gamelift_fleet.go +++ b/aws/resource_aws_gamelift_fleet.go @@ -301,10 +301,10 @@ func resourceAwsGameliftFleetUpdate(d *schema.ResourceData, meta interface{}) er if d.HasChange("description") || d.HasChange("metric_groups") || d.HasChange("name") || d.HasChange("new_game_session_protection_policy") || d.HasChange("resource_creation_limit_policy") { _, err := conn.UpdateFleetAttributes(&gamelift.UpdateFleetAttributesInput{ - Description: aws.String(d.Get("description").(string)), - FleetId: aws.String(d.Id()), - MetricGroups: expandStringList(d.Get("metric_groups").([]interface{})), - Name: aws.String(d.Get("name").(string)), + Description: aws.String(d.Get("description").(string)), + FleetId: aws.String(d.Id()), + MetricGroups: expandStringList(d.Get("metric_groups").([]interface{})), + Name: aws.String(d.Get("name").(string)), NewGameSessionProtectionPolicy: aws.String(d.Get("new_game_session_protection_policy").(string)), ResourceCreationLimitPolicy: expandGameliftResourceCreationLimitPolicy(d.Get("resource_creation_limit_policy").([]interface{})), }) @@ -318,7 +318,7 @@ func resourceAwsGameliftFleetUpdate(d *schema.ResourceData, meta interface{}) er authorizations, revocations := diffGameliftPortSettings(oldPerms.([]interface{}), newPerms.([]interface{})) _, err := conn.UpdateFleetPortSettings(&gamelift.UpdateFleetPortSettingsInput{ - FleetId: aws.String(d.Id()), + FleetId: aws.String(d.Id()), InboundPermissionAuthorizations: authorizations, InboundPermissionRevocations: revocations, }) diff --git a/aws/resource_aws_instance.go b/aws/resource_aws_instance.go index a51ad8f461c..65637d7a05c 100644 --- a/aws/resource_aws_instance.go +++ b/aws/resource_aws_instance.go @@ -505,12 +505,12 @@ func resourceAwsInstanceCreate(d *schema.ResourceData, meta interface{}) error { // Build the creation struct runOpts := &ec2.RunInstancesInput{ - BlockDeviceMappings: instanceOpts.BlockDeviceMappings, - DisableApiTermination: instanceOpts.DisableAPITermination, - EbsOptimized: instanceOpts.EBSOptimized, - Monitoring: instanceOpts.Monitoring, - IamInstanceProfile: instanceOpts.IAMInstanceProfile, - ImageId: instanceOpts.ImageID, + BlockDeviceMappings: instanceOpts.BlockDeviceMappings, + DisableApiTermination: instanceOpts.DisableAPITermination, + EbsOptimized: instanceOpts.EBSOptimized, + Monitoring: instanceOpts.Monitoring, + IamInstanceProfile: instanceOpts.IAMInstanceProfile, + ImageId: instanceOpts.ImageID, InstanceInitiatedShutdownBehavior: instanceOpts.InstanceInitiatedShutdownBehavior, InstanceType: instanceOpts.InstanceType, Ipv6AddressCount: instanceOpts.Ipv6AddressCount, diff --git a/aws/resource_aws_instance_migrate_test.go b/aws/resource_aws_instance_migrate_test.go index d392943315e..bc591fd092a 100644 --- a/aws/resource_aws_instance_migrate_test.go +++ b/aws/resource_aws_instance_migrate_test.go @@ -17,7 +17,7 @@ func TestAWSInstanceMigrateState(t *testing.T) { StateVersion: 0, Attributes: map[string]string{ // EBS - "block_device.#": "2", + "block_device.#": "2", "block_device.3851383343.delete_on_termination": "true", "block_device.3851383343.device_name": "/dev/sdx", "block_device.3851383343.encrypted": "false", @@ -42,7 +42,7 @@ func TestAWSInstanceMigrateState(t *testing.T) { "block_device.56575650.volume_type": "standard", }, Expected: map[string]string{ - "ebs_block_device.#": "1", + "ebs_block_device.#": "1", "ebs_block_device.3851383343.delete_on_termination": "true", "ebs_block_device.3851383343.device_name": "/dev/sdx", "ebs_block_device.3851383343.encrypted": "false", @@ -64,7 +64,7 @@ func TestAWSInstanceMigrateState(t *testing.T) { StateVersion: 0, Attributes: map[string]string{ // EBS - "block_device.#": "2", + "block_device.#": "2", "block_device.3851383343.delete_on_termination": "true", "block_device.3851383343.device_name": "/dev/sdx", "block_device.3851383343.encrypted": "false", @@ -92,7 +92,7 @@ func TestAWSInstanceMigrateState(t *testing.T) { "root_block_device.3018388612.iops": "1000", }, Expected: map[string]string{ - "ebs_block_device.#": "1", + "ebs_block_device.#": "1", "ebs_block_device.3851383343.delete_on_termination": "true", "ebs_block_device.3851383343.device_name": "/dev/sdx", "ebs_block_device.3851383343.encrypted": "false", diff --git a/aws/resource_aws_kinesis_firehose_delivery_stream.go b/aws/resource_aws_kinesis_firehose_delivery_stream.go index 74dedf576b2..d570bb62b60 100644 --- a/aws/resource_aws_kinesis_firehose_delivery_stream.go +++ b/aws/resource_aws_kinesis_firehose_delivery_stream.go @@ -228,11 +228,11 @@ func flattenFirehoseExtendedS3Configuration(description *firehose.ExtendedS3Dest "cloudwatch_logging_options": flattenCloudwatchLoggingOptions(description.CloudWatchLoggingOptions), "compression_format": aws.StringValue(description.CompressionFormat), "data_format_conversion_configuration": flattenFirehoseDataFormatConversionConfiguration(description.DataFormatConversionConfiguration), - "prefix": aws.StringValue(description.Prefix), - "processing_configuration": flattenProcessingConfiguration(description.ProcessingConfiguration, aws.StringValue(description.RoleARN)), - "role_arn": aws.StringValue(description.RoleARN), - "s3_backup_configuration": flattenFirehoseS3Configuration(description.S3BackupDescription), - "s3_backup_mode": aws.StringValue(description.S3BackupMode), + "prefix": aws.StringValue(description.Prefix), + "processing_configuration": flattenProcessingConfiguration(description.ProcessingConfiguration, aws.StringValue(description.RoleARN)), + "role_arn": aws.StringValue(description.RoleARN), + "s3_backup_configuration": flattenFirehoseS3Configuration(description.S3BackupDescription), + "s3_backup_mode": aws.StringValue(description.S3BackupMode), } if description.BufferingHints != nil { diff --git a/aws/resource_aws_neptune_cluster_instance.go b/aws/resource_aws_neptune_cluster_instance.go index 026feeb7346..6cb8ec42a41 100644 --- a/aws/resource_aws_neptune_cluster_instance.go +++ b/aws/resource_aws_neptune_cluster_instance.go @@ -196,7 +196,7 @@ func resourceAwsNeptuneClusterInstanceCreate(d *schema.ResourceData, meta interf PubliclyAccessible: aws.Bool(d.Get("publicly_accessible").(bool)), PromotionTier: aws.Int64(int64(d.Get("promotion_tier").(int))), AutoMinorVersionUpgrade: aws.Bool(d.Get("auto_minor_version_upgrade").(bool)), - Tags: tags, + Tags: tags, } if attr, ok := d.GetOk("availability_zone"); ok { diff --git a/aws/resource_aws_neptune_cluster_parameter_group.go b/aws/resource_aws_neptune_cluster_parameter_group.go index a04db20a2d5..7a879889d5c 100644 --- a/aws/resource_aws_neptune_cluster_parameter_group.go +++ b/aws/resource_aws_neptune_cluster_parameter_group.go @@ -154,7 +154,7 @@ func resourceAwsNeptuneClusterParameterGroupRead(d *schema.ResourceData, meta in // Only include user customized parameters as there's hundreds of system/default ones describeParametersOpts := neptune.DescribeDBClusterParametersInput{ DBClusterParameterGroupName: aws.String(d.Id()), - Source: aws.String("user"), + Source: aws.String("user"), } describeParametersResp, err := conn.DescribeDBClusterParameters(&describeParametersOpts) diff --git a/aws/resource_aws_rds_cluster_instance.go b/aws/resource_aws_rds_cluster_instance.go index 4a65db57786..70ad3d3dafe 100644 --- a/aws/resource_aws_rds_cluster_instance.go +++ b/aws/resource_aws_rds_cluster_instance.go @@ -216,7 +216,7 @@ func resourceAwsRDSClusterInstanceCreate(d *schema.ResourceData, meta interface{ PubliclyAccessible: aws.Bool(d.Get("publicly_accessible").(bool)), PromotionTier: aws.Int64(int64(d.Get("promotion_tier").(int))), AutoMinorVersionUpgrade: aws.Bool(d.Get("auto_minor_version_upgrade").(bool)), - Tags: tags, + Tags: tags, } if attr, ok := d.GetOk("availability_zone"); ok { diff --git a/aws/resource_aws_rds_cluster_parameter_group.go b/aws/resource_aws_rds_cluster_parameter_group.go index c882de7660a..577a5b6f4b3 100644 --- a/aws/resource_aws_rds_cluster_parameter_group.go +++ b/aws/resource_aws_rds_cluster_parameter_group.go @@ -161,7 +161,7 @@ func resourceAwsRDSClusterParameterGroupRead(d *schema.ResourceData, meta interf // Only include user customized parameters as there's hundreds of system/default ones describeParametersOpts := rds.DescribeDBClusterParametersInput{ DBClusterParameterGroupName: aws.String(d.Id()), - Source: aws.String("user"), + Source: aws.String("user"), } describeParametersResp, err := rdsconn.DescribeDBClusterParameters(&describeParametersOpts) diff --git a/aws/resource_aws_redshift_cluster.go b/aws/resource_aws_redshift_cluster.go index 6cde16cef90..9f6c99ee3cf 100644 --- a/aws/resource_aws_redshift_cluster.go +++ b/aws/resource_aws_redshift_cluster.go @@ -415,7 +415,7 @@ func resourceAwsRedshiftClusterCreate(d *schema.ResourceData, meta interface{}) AllowVersionUpgrade: aws.Bool(d.Get("allow_version_upgrade").(bool)), PubliclyAccessible: aws.Bool(d.Get("publicly_accessible").(bool)), AutomatedSnapshotRetentionPeriod: aws.Int64(int64(d.Get("automated_snapshot_retention_period").(int))), - Tags: tags, + Tags: tags, } if v := d.Get("number_of_nodes").(int); v > 1 { diff --git a/aws/resource_aws_route53_record.go b/aws/resource_aws_route53_record.go index f0f6651065e..92c10adb301 100644 --- a/aws/resource_aws_route53_record.go +++ b/aws/resource_aws_route53_record.go @@ -541,8 +541,8 @@ func resourceAwsRoute53RecordRead(d *schema.ResourceData, meta interface{}) erro name := normalizeAwsAliasName(*alias.DNSName) d.Set("alias", []interface{}{ map[string]interface{}{ - "zone_id": *alias.HostedZoneId, - "name": name, + "zone_id": *alias.HostedZoneId, + "name": name, "evaluate_target_health": *alias.EvaluateTargetHealth, }, }) diff --git a/aws/resource_aws_s3_bucket.go b/aws/resource_aws_s3_bucket.go index c935ddb2258..e304cd614ed 100644 --- a/aws/resource_aws_s3_bucket.go +++ b/aws/resource_aws_s3_bucket.go @@ -1700,7 +1700,7 @@ func resourceAwsS3BucketServerSideEncryptionConfigurationUpdate(s3conn *s3.S3, d rc.Rules = rules i := &s3.PutBucketEncryptionInput{ - Bucket: aws.String(bucket), + Bucket: aws.String(bucket), ServerSideEncryptionConfiguration: rc, } log.Printf("[DEBUG] S3 put bucket replication configuration: %#v", i) @@ -1807,7 +1807,7 @@ func resourceAwsS3BucketReplicationConfigurationUpdate(s3conn *s3.S3, d *schema. rc.Rules = rules i := &s3.PutBucketReplicationInput{ - Bucket: aws.String(bucket), + Bucket: aws.String(bucket), ReplicationConfiguration: rc, } log.Printf("[DEBUG] S3 put bucket replication configuration: %#v", i) diff --git a/aws/resource_aws_s3_bucket_inventory.go b/aws/resource_aws_s3_bucket_inventory.go index 43a0498fb0c..71b8f7eb0d8 100644 --- a/aws/resource_aws_s3_bucket_inventory.go +++ b/aws/resource_aws_s3_bucket_inventory.go @@ -221,8 +221,8 @@ func resourceAwsS3BucketInventoryPut(d *schema.ResourceData, meta interface{}) e } input := &s3.PutBucketInventoryConfigurationInput{ - Bucket: aws.String(bucket), - Id: aws.String(name), + Bucket: aws.String(bucket), + Id: aws.String(name), InventoryConfiguration: inventoryConfiguration, } diff --git a/aws/resource_aws_s3_bucket_notification.go b/aws/resource_aws_s3_bucket_notification.go index ba03a393754..4e313b6e833 100644 --- a/aws/resource_aws_s3_bucket_notification.go +++ b/aws/resource_aws_s3_bucket_notification.go @@ -304,7 +304,7 @@ func resourceAwsS3BucketNotificationPut(d *schema.ResourceData, meta interface{} notificationConfiguration.TopicConfigurations = topicConfigs } i := &s3.PutBucketNotificationConfigurationInput{ - Bucket: aws.String(bucket), + Bucket: aws.String(bucket), NotificationConfiguration: notificationConfiguration, } @@ -336,7 +336,7 @@ func resourceAwsS3BucketNotificationDelete(d *schema.ResourceData, meta interfac s3conn := meta.(*AWSClient).s3conn i := &s3.PutBucketNotificationConfigurationInput{ - Bucket: aws.String(d.Id()), + Bucket: aws.String(d.Id()), NotificationConfiguration: &s3.NotificationConfiguration{}, } diff --git a/aws/resource_aws_security_group_migrate_test.go b/aws/resource_aws_security_group_migrate_test.go index 3b14edb0e5e..e990ef3e1f1 100644 --- a/aws/resource_aws_security_group_migrate_test.go +++ b/aws/resource_aws_security_group_migrate_test.go @@ -19,7 +19,7 @@ func TestAWSSecurityGroupMigrateState(t *testing.T) { "name": "test", }, Expected: map[string]string{ - "name": "test", + "name": "test", "revoke_rules_on_delete": "false", }, }, diff --git a/aws/resource_aws_service_discovery_service_migrate_test.go b/aws/resource_aws_service_discovery_service_migrate_test.go index 8a36485b451..ddd24a8f46b 100644 --- a/aws/resource_aws_service_discovery_service_migrate_test.go +++ b/aws/resource_aws_service_discovery_service_migrate_test.go @@ -24,7 +24,7 @@ func TestAwsServiceDiscoveryServiceMigrateState(t *testing.T) { "dns_config.0.dns_records.#": "1", "dns_config.0.dns_records.0.ttl": "10", "dns_config.0.dns_records.0.type": "A", - "arn": "arn", + "arn": "arn", }, Expected: map[string]string{ "name": "test-name", @@ -34,7 +34,7 @@ func TestAwsServiceDiscoveryServiceMigrateState(t *testing.T) { "dns_config.0.dns_records.#": "1", "dns_config.0.dns_records.0.ttl": "10", "dns_config.0.dns_records.0.type": "A", - "arn": "arn", + "arn": "arn", }, }, } diff --git a/aws/resource_aws_sns_topic.go b/aws/resource_aws_sns_topic.go index 519aa4698f2..be5d2bfcc8e 100644 --- a/aws/resource_aws_sns_topic.go +++ b/aws/resource_aws_sns_topic.go @@ -27,10 +27,10 @@ var SNSAttributeMap = map[string]string{ "lambda_failure_feedback_role_arn": "LambdaFailureFeedbackRoleArn", "lambda_success_feedback_role_arn": "LambdaSuccessFeedbackRoleArn", "lambda_success_feedback_sample_rate": "LambdaSuccessFeedbackSampleRate", - "policy": "Policy", - "sqs_failure_feedback_role_arn": "SQSFailureFeedbackRoleArn", - "sqs_success_feedback_role_arn": "SQSSuccessFeedbackRoleArn", - "sqs_success_feedback_sample_rate": "SQSSuccessFeedbackSampleRate", + "policy": "Policy", + "sqs_failure_feedback_role_arn": "SQSFailureFeedbackRoleArn", + "sqs_success_feedback_role_arn": "SQSSuccessFeedbackRoleArn", + "sqs_success_feedback_sample_rate": "SQSSuccessFeedbackSampleRate", } func resourceAwsSnsTopic() *schema.Resource { diff --git a/aws/resource_aws_spot_fleet_request.go b/aws/resource_aws_spot_fleet_request.go index d794d09c508..15fcb4c01ed 100644 --- a/aws/resource_aws_spot_fleet_request.go +++ b/aws/resource_aws_spot_fleet_request.go @@ -610,7 +610,7 @@ func resourceAwsSpotFleetRequestCreate(d *schema.ResourceData, meta interface{}) TerminateInstancesWithExpiration: aws.Bool(d.Get("terminate_instances_with_expiration").(bool)), ReplaceUnhealthyInstances: aws.Bool(d.Get("replace_unhealthy_instances").(bool)), InstanceInterruptionBehavior: aws.String(d.Get("instance_interruption_behaviour").(string)), - Type: aws.String(d.Get("fleet_type").(string)), + Type: aws.String(d.Get("fleet_type").(string)), } if v, ok := d.GetOk("excess_capacity_termination_policy"); ok { diff --git a/aws/resource_aws_spot_instance_request.go b/aws/resource_aws_spot_instance_request.go index 5a0dbeabc84..5460b0790cc 100644 --- a/aws/resource_aws_spot_instance_request.go +++ b/aws/resource_aws_spot_instance_request.go @@ -118,8 +118,8 @@ func resourceAwsSpotInstanceRequestCreate(d *schema.ResourceData, meta interface } spotOpts := &ec2.RequestSpotInstancesInput{ - SpotPrice: aws.String(d.Get("spot_price").(string)), - Type: aws.String(d.Get("spot_type").(string)), + SpotPrice: aws.String(d.Get("spot_price").(string)), + Type: aws.String(d.Get("spot_type").(string)), InstanceInterruptionBehavior: aws.String(d.Get("instance_interruption_behaviour").(string)), // Though the AWS API supports creating spot instance requests for multiple diff --git a/aws/resource_aws_ssm_maintenance_window.go b/aws/resource_aws_ssm_maintenance_window.go index a7c939cc747..f9d55e8d039 100644 --- a/aws/resource_aws_ssm_maintenance_window.go +++ b/aws/resource_aws_ssm_maintenance_window.go @@ -55,10 +55,10 @@ func resourceAwsSsmMaintenanceWindowCreate(d *schema.ResourceData, meta interfac ssmconn := meta.(*AWSClient).ssmconn params := &ssm.CreateMaintenanceWindowInput{ - Name: aws.String(d.Get("name").(string)), - Schedule: aws.String(d.Get("schedule").(string)), - Duration: aws.Int64(int64(d.Get("duration").(int))), - Cutoff: aws.Int64(int64(d.Get("cutoff").(int))), + Name: aws.String(d.Get("name").(string)), + Schedule: aws.String(d.Get("schedule").(string)), + Duration: aws.Int64(int64(d.Get("duration").(int))), + Cutoff: aws.Int64(int64(d.Get("cutoff").(int))), AllowUnassociatedTargets: aws.Bool(d.Get("allow_unassociated_targets").(bool)), } diff --git a/aws/resource_aws_ssm_patch_baseline.go b/aws/resource_aws_ssm_patch_baseline.go index c271c84ae40..7183190f2a9 100644 --- a/aws/resource_aws_ssm_patch_baseline.go +++ b/aws/resource_aws_ssm_patch_baseline.go @@ -147,7 +147,7 @@ func resourceAwsSsmPatchBaselineCreate(d *schema.ResourceData, meta interface{}) ssmconn := meta.(*AWSClient).ssmconn params := &ssm.CreatePatchBaselineInput{ - Name: aws.String(d.Get("name").(string)), + Name: aws.String(d.Get("name").(string)), ApprovedPatchesComplianceLevel: aws.String(d.Get("approved_patches_compliance_level").(string)), OperatingSystem: aws.String(d.Get("operating_system").(string)), } diff --git a/aws/resource_aws_swf_domain.go b/aws/resource_aws_swf_domain.go index 5e254496611..8668ec108fd 100644 --- a/aws/resource_aws_swf_domain.go +++ b/aws/resource_aws_swf_domain.go @@ -70,7 +70,7 @@ func resourceAwsSwfDomainCreate(d *schema.ResourceData, meta interface{}) error } input := &swf.RegisterDomainInput{ - Name: aws.String(name), + Name: aws.String(name), WorkflowExecutionRetentionPeriodInDays: aws.String(d.Get("workflow_execution_retention_period_in_days").(string)), } diff --git a/aws/resource_aws_vpc.go b/aws/resource_aws_vpc.go index 73a9defe488..f6f0b4dff7c 100644 --- a/aws/resource_aws_vpc.go +++ b/aws/resource_aws_vpc.go @@ -411,7 +411,7 @@ func resourceAwsVpcUpdate(d *schema.ResourceData, meta interface{}) error { if toAssign { modifyOpts := &ec2.AssociateVpcCidrBlockInput{ - VpcId: &vpcid, + VpcId: &vpcid, AmazonProvidedIpv6CidrBlock: aws.Bool(toAssign), } log.Printf("[INFO] Enabling assign_generated_ipv6_cidr_block vpc attribute for %s: %#v", diff --git a/aws/validators_test.go b/aws/validators_test.go index 3f11fbc8807..6747dc6b71e 100644 --- a/aws/validators_test.go +++ b/aws/validators_test.go @@ -2340,23 +2340,23 @@ func TestValidateCognitoRoleMappingsAmbiguousRoleResolutionAgainstType(t *testin }{ { AmbiguousRoleResolution: nil, - Type: cognitoidentity.RoleMappingTypeToken, - ErrCount: 1, + Type: cognitoidentity.RoleMappingTypeToken, + ErrCount: 1, }, { AmbiguousRoleResolution: "foo", - Type: cognitoidentity.RoleMappingTypeToken, - ErrCount: 0, // 0 as it should be defined, the value isn't validated here + Type: cognitoidentity.RoleMappingTypeToken, + ErrCount: 0, // 0 as it should be defined, the value isn't validated here }, { AmbiguousRoleResolution: cognitoidentity.AmbiguousRoleResolutionTypeAuthenticatedRole, - Type: cognitoidentity.RoleMappingTypeToken, - ErrCount: 0, + Type: cognitoidentity.RoleMappingTypeToken, + ErrCount: 0, }, { AmbiguousRoleResolution: cognitoidentity.AmbiguousRoleResolutionTypeDeny, - Type: cognitoidentity.RoleMappingTypeToken, - ErrCount: 0, + Type: cognitoidentity.RoleMappingTypeToken, + ErrCount: 0, }, } From 661280db60a62c55d71f351c3680c40031318c55 Mon Sep 17 00:00:00 2001 From: Guimove Date: Tue, 4 Sep 2018 15:41:04 +0200 Subject: [PATCH 041/184] Add arns as an output to data aws_autoscaling_groups and doc --- aws/data_source_aws_autoscaling_groups.go | 38 ++++++++++++++++--- ...data_source_aws_autoscaling_groups_test.go | 1 + .../docs/d/autoscaling_groups.html.markdown | 1 + 3 files changed, 35 insertions(+), 5 deletions(-) diff --git a/aws/data_source_aws_autoscaling_groups.go b/aws/data_source_aws_autoscaling_groups.go index 7bc4dc9c350..92468774746 100644 --- a/aws/data_source_aws_autoscaling_groups.go +++ b/aws/data_source_aws_autoscaling_groups.go @@ -21,6 +21,11 @@ func dataSourceAwsAutoscalingGroups() *schema.Resource { Computed: true, Elem: &schema.Schema{Type: schema.TypeString}, }, + "arns": { + Type: schema.TypeList, + Computed: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, "filter": { Type: schema.TypeSet, Optional: true, @@ -49,7 +54,8 @@ func dataSourceAwsAutoscalingGroupsRead(d *schema.ResourceData, meta interface{} log.Printf("[DEBUG] Reading Autoscaling Groups.") d.SetId(time.Now().UTC().String()) - var raw []string + var rawName []string + var rawArn []string var err error tf := d.Get("filter").(*schema.Set) @@ -59,14 +65,31 @@ func dataSourceAwsAutoscalingGroupsRead(d *schema.ResourceData, meta interface{} } err = conn.DescribeTagsPages(input, func(resp *autoscaling.DescribeTagsOutput, lastPage bool) bool { for _, v := range resp.Tags { - raw = append(raw, aws.StringValue(v.ResourceId)) + rawName = append(rawName, aws.StringValue(v.ResourceId)) } return !lastPage }) + + for _, v := range rawName { + input := &autoscaling.DescribeAutoScalingGroupsInput{ + AutoScalingGroupNames: []*string{ + aws.String(v), + }, + } + + err = conn.DescribeAutoScalingGroupsPages(input, func(resp *autoscaling.DescribeAutoScalingGroupsOutput, lastPage bool) bool { + for _, group := range resp.AutoScalingGroups { + rawArn = append(rawArn, aws.StringValue(group.AutoScalingGroupARN)) + } + return !lastPage + }) + } + } else { err = conn.DescribeAutoScalingGroupsPages(&autoscaling.DescribeAutoScalingGroupsInput{}, func(resp *autoscaling.DescribeAutoScalingGroupsOutput, lastPage bool) bool { for _, group := range resp.AutoScalingGroups { - raw = append(raw, aws.StringValue(group.AutoScalingGroupName)) + rawName = append(rawName, aws.StringValue(group.AutoScalingGroupName)) + rawArn = append(rawArn, aws.StringValue(group.AutoScalingGroupARN)) } return !lastPage }) @@ -75,12 +98,17 @@ func dataSourceAwsAutoscalingGroupsRead(d *schema.ResourceData, meta interface{} return fmt.Errorf("Error fetching Autoscaling Groups: %s", err) } - sort.Strings(raw) + sort.Strings(rawName) + sort.Strings(rawArn) - if err := d.Set("names", raw); err != nil { + if err := d.Set("names", rawName); err != nil { return fmt.Errorf("[WARN] Error setting Autoscaling Group Names: %s", err) } + if err := d.Set("arns", rawArn); err != nil { + return fmt.Errorf("[WARN] Error setting Autoscaling Group Arns: %s", err) + } + return nil } diff --git a/aws/data_source_aws_autoscaling_groups_test.go b/aws/data_source_aws_autoscaling_groups_test.go index 67a478c59bf..a6f8c0306ca 100644 --- a/aws/data_source_aws_autoscaling_groups_test.go +++ b/aws/data_source_aws_autoscaling_groups_test.go @@ -25,6 +25,7 @@ func TestAccAWSAutoscalingGroups_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckAwsAutoscalingGroups("data.aws_autoscaling_groups.group_list"), resource.TestCheckResourceAttr("data.aws_autoscaling_groups.group_list", "names.#", "3"), + resource.TestCheckResourceAttr("data.aws_autoscaling_groups.group_list", "arns.#", "3"), ), }, }, diff --git a/website/docs/d/autoscaling_groups.html.markdown b/website/docs/d/autoscaling_groups.html.markdown index 4112a6bd826..f5b4c49c6eb 100644 --- a/website/docs/d/autoscaling_groups.html.markdown +++ b/website/docs/d/autoscaling_groups.html.markdown @@ -51,3 +51,4 @@ resource "aws_autoscaling_notification" "slack_notifications" { In addition to all arguments above, the following attributes are exported: * `names` - A list of the Autoscaling Groups in the current region. +* `arns` - A list of the Autoscaling Groups Arns in the current region. From f6a9f27cdc90ba361e902137fa2a843566c041ba Mon Sep 17 00:00:00 2001 From: Patrick Rainier Juen Date: Tue, 4 Sep 2018 23:04:08 +0800 Subject: [PATCH 042/184] Specify when to use names or IDs in security groups --- website/docs/r/instance.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/instance.html.markdown b/website/docs/r/instance.html.markdown index 9e67eabbebd..21f1be81c59 100644 --- a/website/docs/r/instance.html.markdown +++ b/website/docs/r/instance.html.markdown @@ -77,7 +77,7 @@ instances. See [Shutdown Behavior](https://docs.aws.amazon.com/AWSEC2/latest/Use * `get_password_data` - (Optional) If true, wait for password data to become available and retrieve it. Useful for getting the administrator password for instances running Microsoft Windows. The password data is exported to the `password_data` attribute. See [GetPasswordData](https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_GetPasswordData.html) for more information. * `monitoring` - (Optional) If true, the launched EC2 instance will have detailed monitoring enabled. (Available since v0.6.0) -* `security_groups` - (Optional, EC2-Classic and default VPC only) A list of security group names or IDs to associate with. +* `security_groups` - (Optional, EC2-Classic and default VPC only) A list of security group names (EC2-Classic) or IDs (default VPC) to associate with. -> **NOTE:** If you are creating Instances in a VPC, use `vpc_security_group_ids` instead. From 7d91d000be6adec7dae72f52e5a31f648c806441 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 4 Sep 2018 13:35:12 -0400 Subject: [PATCH 043/184] website: Remove Upcoming Events sidebar section Its no longer upcoming. :) Remove the existing event page from the provider as well since it now redirects to its new home: https://www.terraform.io/docs/extend/community/events/2018/summer-gardening.html --- website/aws.erb | 11 ---- .../docs/events/gardening-summer-2018.html.md | 51 ------------------- 2 files changed, 62 deletions(-) delete mode 100644 website/docs/events/gardening-summer-2018.html.md diff --git a/website/aws.erb b/website/aws.erb index c5710e4ddc8..30f400d20b9 100644 --- a/website/aws.erb +++ b/website/aws.erb @@ -10,17 +10,6 @@ AWS Provider - > - Upcoming Community Events - - - > Guides
    diff --git a/website/docs/events/gardening-summer-2018.html.md b/website/docs/events/gardening-summer-2018.html.md deleted file mode 100644 index 03b2e73ab3c..00000000000 --- a/website/docs/events/gardening-summer-2018.html.md +++ /dev/null @@ -1,51 +0,0 @@ ---- -layout: "aws" -page_title: "Community Gardening - Summer 2018" -sidebar_current: "docs-aws-community-events-gardening-summer-2018" -description: |- - Community Gardening - Summer 2018 ---- - -# Community Gardening - Summer 2018 - -On June 21, 2018 the Terraform AWS team is going to put together a virtual, all time zones (best we can), community gardening session for the Terraform AWS provider, inspired by [Go's gardening concept](https://github.com/golang/go/wiki/Gardening). We plan to do this for other Terraform providers and OSS projects eventually. - -We have some amazing contributors to AWS and want to get them more involved. This allows people with all levels of AWS knowledge to participate from small, medium, and larger infrastructures. Beginners will have an opportunity to get positive support from more advanced users and HashiCorp will provide participants for quick knowledge. - -## What to Expect - -What do we plan to do first? - -* Weeding - -Why are we starting here? - -* We currently have 1600 issues for AWS. -* There are certainly duplicates -* Bugs that have been fixed -* Bugs that need to be fixed that we do not have time for due to volume - -What we are giving away for participating? - -* Sweatshirts for the top 5 people who close the most issues via bug closure or finding duplicates and closing issues -* T-shirts for the next top 10 people who close the most issues via bug closure or finding duplicates and closing issues -* HashiCorp mug for the next top 10 who close the most issues via bug closure or finding duplicates and closing issues -* Stickers for everyone. - -If you are going to be at HashiDays or HashiConf, let us know and we will set the goodies aside for you. Otherwise please feel free to reach out to Beth Fuller with your address and she’ll send that to you. - -## Event Information - -### Realtime Communication - -We will have a [Gitter](https://gitter.im/) room available at [`hashicorp-terraform/gardening`](https://gitter.im/hashicorp-terraform/gardening) and a someone from HashiCorp on [Zoom conferencing](https://zoom.us/) through out the time zones. - -### Community Issue Selection - -Anything marked `HashiCorp in Progress` please reach out first via the Gitter room or Zoom channel. - -## Feedback - -AWS is our first step, as contributors to this project, we want your feedback on how the event went. Please send all good, bad, could be better feedback to beth@hashicorp.com so that we can make improvements on a continuous basis. - -We really appreciate the communities feedback, help and participation. We also want to make sure we are bring you along with our roadmap and listening to your feedback about what business problems you are running into so that we can adjust quicker. From 1284e40ac1aad02ec848fc1ab5908d7f9172fb9f Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 4 Sep 2018 13:44:13 -0400 Subject: [PATCH 044/184] Update CHANGELOG for #5758 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c00e7730020..11443e72d79 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ ENHANCEMENTS: BUG FIXES: * resource/aws_ecr_repository: Use `RepositoryUri` instead of our building our own URI for the `repository_url` attribute (AWS China fix) [GH-5748] +* resource/aws_redshift_cluster: Properly force new resource when updating `availability_zone` argument [GH-5758] ## 1.34.0 (August 30, 2018) From 9e10cba8dde24eff2f1202341c9a1d278f83c41b Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 4 Sep 2018 19:11:11 -0400 Subject: [PATCH 045/184] vendor: Pin mitchellh/go-wordwrap@v1.0.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In preparation for Go modules. No-op change. 👍 * Updated via: `govendor fetch github.com/mitchellh/go-wordwrap/...@v1.0.0` --- vendor/github.com/mitchellh/go-wordwrap/go.mod | 1 + vendor/vendor.json | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 vendor/github.com/mitchellh/go-wordwrap/go.mod diff --git a/vendor/github.com/mitchellh/go-wordwrap/go.mod b/vendor/github.com/mitchellh/go-wordwrap/go.mod new file mode 100644 index 00000000000..2ae411b2012 --- /dev/null +++ b/vendor/github.com/mitchellh/go-wordwrap/go.mod @@ -0,0 +1 @@ +module github.com/mitchellh/go-wordwrap diff --git a/vendor/vendor.json b/vendor/vendor.json index 8f096cdcfbe..ac5e58046f4 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -1700,10 +1700,12 @@ "revisionTime": "2017-10-04T22:19:16Z" }, { - "checksumSHA1": "L3leymg2RT8hFl5uL+5KP/LpBkg=", + "checksumSHA1": "2gW/SeTAbHsmAdoDes4DksvqTj4=", "path": "github.com/mitchellh/go-wordwrap", - "revision": "ad45545899c7b13c020ea92b2072220eefad42b8", - "revisionTime": "2015-03-14T17:03:34Z" + "revision": "9e67c67572bc5dd02aef930e2b0ae3c02a4b5a5c", + "revisionTime": "2018-08-28T14:53:44Z", + "version": "v1.0.0", + "versionExact": "v1.0.0" }, { "checksumSHA1": "xyoJKalfQwTUN1qzZGQKWYAwl0A=", From 4472a96048a28fd05ca4b8c469ccb332f8c35277 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 4 Sep 2018 19:35:42 -0400 Subject: [PATCH 046/184] vendor: mitchellh/hashstructure@v1.0.0 Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/5773 * Updated via: `govendor fetch github.com/mitchellh/hashstructure/...@v1.0.0` ``` $ make test TEST=./aws ==> Checking that code complies with gofmt requirements... go test ./aws -timeout=30s -parallel=4 ok github.com/terraform-providers/terraform-provider-aws/aws 2.537s ``` --- .../mitchellh/hashstructure/README.md | 56 +++++++++-------- .../github.com/mitchellh/hashstructure/go.mod | 1 + .../mitchellh/hashstructure/hashstructure.go | 63 ++++++++++++++----- vendor/vendor.json | 7 ++- 4 files changed, 85 insertions(+), 42 deletions(-) create mode 100644 vendor/github.com/mitchellh/hashstructure/go.mod diff --git a/vendor/github.com/mitchellh/hashstructure/README.md b/vendor/github.com/mitchellh/hashstructure/README.md index 7d0de5bf5a6..28ce45a3e18 100644 --- a/vendor/github.com/mitchellh/hashstructure/README.md +++ b/vendor/github.com/mitchellh/hashstructure/README.md @@ -1,4 +1,4 @@ -# hashstructure +# hashstructure [![GoDoc](https://godoc.org/github.com/mitchellh/hashstructure?status.svg)](https://godoc.org/github.com/mitchellh/hashstructure) hashstructure is a Go library for creating a unique hash value for arbitrary values in Go. @@ -19,6 +19,9 @@ sending data across the network, caching values locally (de-dup), and so on. * Optionally specify a custom hash function to optimize for speed, collision avoidance for your data set, etc. + + * Optionally hash the output of `.String()` on structs that implement fmt.Stringer, + allowing effective hashing of time.Time ## Installation @@ -34,28 +37,29 @@ For usage and examples see the [Godoc](http://godoc.org/github.com/mitchellh/has A quick code example is shown below: - - type ComplexStruct struct { - Name string - Age uint - Metadata map[string]interface{} - } - - v := ComplexStruct{ - Name: "mitchellh", - Age: 64, - Metadata: map[string]interface{}{ - "car": true, - "location": "California", - "siblings": []string{"Bob", "John"}, - }, - } - - hash, err := hashstructure.Hash(v, nil) - if err != nil { - panic(err) - } - - fmt.Printf("%d", hash) - // Output: - // 2307517237273902113 +```go +type ComplexStruct struct { + Name string + Age uint + Metadata map[string]interface{} +} + +v := ComplexStruct{ + Name: "mitchellh", + Age: 64, + Metadata: map[string]interface{}{ + "car": true, + "location": "California", + "siblings": []string{"Bob", "John"}, + }, +} + +hash, err := hashstructure.Hash(v, nil) +if err != nil { + panic(err) +} + +fmt.Printf("%d", hash) +// Output: +// 2307517237273902113 +``` diff --git a/vendor/github.com/mitchellh/hashstructure/go.mod b/vendor/github.com/mitchellh/hashstructure/go.mod new file mode 100644 index 00000000000..966582aa95b --- /dev/null +++ b/vendor/github.com/mitchellh/hashstructure/go.mod @@ -0,0 +1 @@ +module github.com/mitchellh/hashstructure diff --git a/vendor/github.com/mitchellh/hashstructure/hashstructure.go b/vendor/github.com/mitchellh/hashstructure/hashstructure.go index 6f586fa7725..ea13a1583c3 100644 --- a/vendor/github.com/mitchellh/hashstructure/hashstructure.go +++ b/vendor/github.com/mitchellh/hashstructure/hashstructure.go @@ -8,6 +8,16 @@ import ( "reflect" ) +// ErrNotStringer is returned when there's an error with hash:"string" +type ErrNotStringer struct { + Field string +} + +// Error implements error for ErrNotStringer +func (ens *ErrNotStringer) Error() string { + return fmt.Sprintf("hashstructure: %s has hash:\"string\" set, but does not implement fmt.Stringer", ens.Field) +} + // HashOptions are options that are available for hashing. type HashOptions struct { // Hasher is the hash function to use. If this isn't set, it will @@ -17,12 +27,18 @@ type HashOptions struct { // TagName is the struct tag to look at when hashing the structure. // By default this is "hash". TagName string + + // ZeroNil is flag determining if nil pointer should be treated equal + // to a zero value of pointed type. By default this is false. + ZeroNil bool } // Hash returns the hash value of an arbitrary value. // // If opts is nil, then default options will be used. See HashOptions -// for the default values. +// for the default values. The same *HashOptions value cannot be used +// concurrently. None of the values within a *HashOptions struct are +// safe to read/write while hashing is being done. // // Notes on the value: // @@ -41,11 +57,14 @@ type HashOptions struct { // // The available tag values are: // -// * "ignore" - The field will be ignored and not affect the hash code. +// * "ignore" or "-" - The field will be ignored and not affect the hash code. // // * "set" - The field will be treated as a set, where ordering doesn't // affect the hash code. This only works for slices. // +// * "string" - The field will be hashed as a string, only works when the +// field implements fmt.Stringer +// func Hash(v interface{}, opts *HashOptions) (uint64, error) { // Create default options if opts == nil { @@ -63,15 +82,17 @@ func Hash(v interface{}, opts *HashOptions) (uint64, error) { // Create our walker and walk the structure w := &walker{ - h: opts.Hasher, - tag: opts.TagName, + h: opts.Hasher, + tag: opts.TagName, + zeronil: opts.ZeroNil, } return w.visit(reflect.ValueOf(v), nil) } type walker struct { - h hash.Hash64 - tag string + h hash.Hash64 + tag string + zeronil bool } type visitOpts struct { @@ -84,6 +105,8 @@ type visitOpts struct { } func (w *walker) visit(v reflect.Value, opts *visitOpts) (uint64, error) { + t := reflect.TypeOf(0) + // Loop since these can be wrapped in multiple layers of pointers // and interfaces. for { @@ -96,6 +119,9 @@ func (w *walker) visit(v reflect.Value, opts *visitOpts) (uint64, error) { } if v.Kind() == reflect.Ptr { + if w.zeronil { + t = v.Type().Elem() + } v = reflect.Indirect(v) continue } @@ -105,8 +131,7 @@ func (w *walker) visit(v reflect.Value, opts *visitOpts) (uint64, error) { // If it is nil, treat it like a zero. if !v.IsValid() { - var tmp int8 - v = reflect.ValueOf(tmp) + v = reflect.Zero(t) } // Binary writing can use raw ints, we have to convert to @@ -189,8 +214,8 @@ func (w *walker) visit(v reflect.Value, opts *visitOpts) (uint64, error) { return h, nil case reflect.Struct: - var include Includable parent := v.Interface() + var include Includable if impl, ok := parent.(Includable); ok { include = impl } @@ -203,7 +228,7 @@ func (w *walker) visit(v reflect.Value, opts *visitOpts) (uint64, error) { l := v.NumField() for i := 0; i < l; i++ { - if v := v.Field(i); v.CanSet() || t.Field(i).Name != "_" { + if innerV := v.Field(i); v.CanSet() || t.Field(i).Name != "_" { var f visitFlag fieldType := t.Field(i) if fieldType.PkgPath != "" { @@ -212,14 +237,25 @@ func (w *walker) visit(v reflect.Value, opts *visitOpts) (uint64, error) { } tag := fieldType.Tag.Get(w.tag) - if tag == "ignore" { + if tag == "ignore" || tag == "-" { // Ignore this field continue } + // if string is set, use the string value + if tag == "string" { + if impl, ok := innerV.Interface().(fmt.Stringer); ok { + innerV = reflect.ValueOf(impl.String()) + } else { + return 0, &ErrNotStringer{ + Field: v.Type().Field(i).Name, + } + } + } + // Check if we implement includable and check it if include != nil { - incl, err := include.HashInclude(fieldType.Name, v) + incl, err := include.HashInclude(fieldType.Name, innerV) if err != nil { return 0, err } @@ -238,7 +274,7 @@ func (w *walker) visit(v reflect.Value, opts *visitOpts) (uint64, error) { return 0, err } - vh, err := w.visit(v, &visitOpts{ + vh, err := w.visit(innerV, &visitOpts{ Flags: f, Struct: parent, StructField: fieldType.Name, @@ -289,7 +325,6 @@ func (w *walker) visit(v reflect.Value, opts *visitOpts) (uint64, error) { return 0, fmt.Errorf("unknown kind to hash: %s", k) } - return 0, nil } func hashUpdateOrdered(h hash.Hash64, a, b uint64) uint64 { diff --git a/vendor/vendor.json b/vendor/vendor.json index 8f096cdcfbe..c4a3a185870 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -1706,9 +1706,12 @@ "revisionTime": "2015-03-14T17:03:34Z" }, { - "checksumSHA1": "xyoJKalfQwTUN1qzZGQKWYAwl0A=", + "checksumSHA1": "gOIe6F97Mcq/PwZjG38FkxervzE=", "path": "github.com/mitchellh/hashstructure", - "revision": "6b17d669fac5e2f71c16658d781ec3fdd3802b69" + "revision": "a38c50148365edc8df43c1580c48fb2b3a1e9cd7", + "revisionTime": "2018-08-28T14:53:49Z", + "version": "v1.0.0", + "versionExact": "v1.0.0" }, { "checksumSHA1": "MlX15lJuV8DYARX5RJY8rqrSEWQ=", From 2b29d0b5b0cf6bcf911121fdca90e2aad381596f Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 4 Sep 2018 19:50:26 -0400 Subject: [PATCH 047/184] vendor: jen20/awspolicyequivalence@v1.0.0 Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/5773 * Updated via: `govendor fetch github.com/jen20/awspolicyequivalence/...@v1.0.0` ``` $ make test TEST=./aws ==> Checking that code complies with gofmt requirements... go test ./aws -timeout=30s -parallel=4 ok github.com/terraform-providers/terraform-provider-aws/aws 2.451s ``` ``` --- PASS: TestAccAWSKmsKey_policy (39.10s) --- PASS: TestAccAWSS3BucketPolicy_basic (33.32s) --- PASS: TestAccAWSS3BucketPolicy_policyUpdate (46.38s) --- PASS: TestAccAwsSecretsManagerSecret_policy (12.56s) --- PASS: TestAccAWSSNSTopic_policy (9.78s) --- PASS: TestAccAWSSQSQueuePolicy_basic (15.60s) --- PASS: TestAccAWSSQSQueuePolicy_import (14.27s) --- PASS: TestAccAWSSQSQueue_policy (16.14s) ``` --- .../aws_policy_equivalence.go | 52 ++++++++++++++----- .../jen20/awspolicyequivalence/go.mod | 3 ++ .../jen20/awspolicyequivalence/go.sum | 2 + vendor/vendor.json | 8 +-- 4 files changed, 50 insertions(+), 15 deletions(-) create mode 100644 vendor/github.com/jen20/awspolicyequivalence/go.mod create mode 100644 vendor/github.com/jen20/awspolicyequivalence/go.sum diff --git a/vendor/github.com/jen20/awspolicyequivalence/aws_policy_equivalence.go b/vendor/github.com/jen20/awspolicyequivalence/aws_policy_equivalence.go index 9150d20ad34..adf38ba5981 100644 --- a/vendor/github.com/jen20/awspolicyequivalence/aws_policy_equivalence.go +++ b/vendor/github.com/jen20/awspolicyequivalence/aws_policy_equivalence.go @@ -9,12 +9,11 @@ package awspolicy import ( "encoding/json" "errors" + "fmt" "reflect" "regexp" "strings" - "github.com/aws/aws-sdk-go/aws/arn" - "github.com/hashicorp/errwrap" "github.com/mitchellh/mapstructure" ) @@ -31,21 +30,21 @@ import ( func PoliciesAreEquivalent(policy1, policy2 string) (bool, error) { policy1intermediate := &intermediateAwsPolicyDocument{} if err := json.Unmarshal([]byte(policy1), policy1intermediate); err != nil { - return false, errwrap.Wrapf("Error unmarshaling policy: {{err}}", err) + return false, fmt.Errorf("Error unmarshaling policy: %s", err) } policy2intermediate := &intermediateAwsPolicyDocument{} if err := json.Unmarshal([]byte(policy2), policy2intermediate); err != nil { - return false, errwrap.Wrapf("Error unmarshaling policy: {{err}}", err) + return false, fmt.Errorf("Error unmarshaling policy: %s", err) } policy1Doc, err := policy1intermediate.document() if err != nil { - return false, errwrap.Wrapf("Error parsing policy: {{err}}", err) + return false, fmt.Errorf("Error parsing policy: %s", err) } policy2Doc, err := policy2intermediate.document() if err != nil { - return false, errwrap.Wrapf("Error parsing policy: {{err}}", err) + return false, fmt.Errorf("Error parsing policy: %s", err) } return policy1Doc.equals(policy2Doc), nil @@ -63,12 +62,12 @@ func (intermediate *intermediateAwsPolicyDocument) document() (*awsPolicyDocumen switch s := intermediate.Statements.(type) { case []interface{}: if err := mapstructure.Decode(s, &statements); err != nil { - return nil, errwrap.Wrapf("Error parsing statement: {{err}}", err) + return nil, fmt.Errorf("Error parsing statement: %s", err) } case map[string]interface{}: var singleStatement *awsPolicyStatement if err := mapstructure.Decode(s, &singleStatement); err != nil { - return nil, errwrap.Wrapf("Error parsing statement: {{err}}", err) + return nil, fmt.Errorf("Error parsing statement: %s", err) } statements = append(statements, singleStatement) default: @@ -276,16 +275,16 @@ func stringPrincipalsEqual(ours, theirs interface{}) bool { awsAccountIDRegex := regexp.MustCompile(`^[0-9]{12}$`) if awsAccountIDRegex.MatchString(ourPrincipal) { - if theirArn, err := arn.Parse(theirPrincipal); err == nil { - if theirArn.Service == "iam" && theirArn.Resource == "root" && theirArn.AccountID == ourPrincipal { + if theirArn, err := parseAwsArnString(theirPrincipal); err == nil { + if theirArn.service == "iam" && theirArn.resource == "root" && theirArn.account == ourPrincipal { return true } } } if awsAccountIDRegex.MatchString(theirPrincipal) { - if ourArn, err := arn.Parse(ourPrincipal); err == nil { - if ourArn.Service == "iam" && ourArn.Resource == "root" && ourArn.AccountID == theirPrincipal { + if ourArn, err := parseAwsArnString(ourPrincipal); err == nil { + if ourArn.service == "iam" && ourArn.resource == "root" && ourArn.account == theirPrincipal { return true } } @@ -435,3 +434,32 @@ func (ours awsPrincipalStringSet) equals(theirs awsPrincipalStringSet) bool { return true } + +// awsArn describes an Amazon Resource Name +// More information: http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html +type awsArn struct { + account string + partition string + region string + resource string + service string +} + +// parseAwsArnString converts a string into an awsArn +// Expects string in form of: arn:PARTITION:SERVICE:REGION:ACCOUNT:RESOURCE +func parseAwsArnString(arn string) (awsArn, error) { + if !strings.HasPrefix(arn, "arn:") { + return awsArn{}, fmt.Errorf("expected arn: prefix, received: %s", arn) + } + arnParts := strings.SplitN(arn, ":", 6) + if len(arnParts) != 6 { + return awsArn{}, fmt.Errorf("expected 6 colon delimited sections, received: %s", arn) + } + return awsArn{ + account: arnParts[4], + partition: arnParts[1], + region: arnParts[3], + resource: arnParts[5], + service: arnParts[2], + }, nil +} diff --git a/vendor/github.com/jen20/awspolicyequivalence/go.mod b/vendor/github.com/jen20/awspolicyequivalence/go.mod new file mode 100644 index 00000000000..35e1621e867 --- /dev/null +++ b/vendor/github.com/jen20/awspolicyequivalence/go.mod @@ -0,0 +1,3 @@ +module github.com/jen20/awspolicyequivalence + +require github.com/mitchellh/mapstructure v1.0.0 diff --git a/vendor/github.com/jen20/awspolicyequivalence/go.sum b/vendor/github.com/jen20/awspolicyequivalence/go.sum new file mode 100644 index 00000000000..8f6af4f3948 --- /dev/null +++ b/vendor/github.com/jen20/awspolicyequivalence/go.sum @@ -0,0 +1,2 @@ +github.com/mitchellh/mapstructure v1.0.0 h1:vVpGvMXJPqSDh2VYHF7gsfQj8Ncx+Xw5Y1KHeTRY+7I= +github.com/mitchellh/mapstructure v1.0.0/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= diff --git a/vendor/vendor.json b/vendor/vendor.json index 8f096cdcfbe..be03efcbbe7 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -1603,10 +1603,12 @@ "revisionTime": "2016-07-20T23:31:40Z" }, { - "checksumSHA1": "77PKgZO4nQy8w8CKOQAc9/vrAmo=", + "checksumSHA1": "x+4RAiAczFwq+qsWJUEb9oRpgjM=", "path": "github.com/jen20/awspolicyequivalence", - "revision": "9fbcaca9f9f868b9560463d0790aae33b2322945", - "revisionTime": "2018-03-16T12:05:52Z" + "revision": "9ebbf3c225b2b9da629263e13c3015a5de7965d1", + "revisionTime": "2018-08-29T22:45:56Z", + "version": "v1.0.0", + "versionExact": "v1.0.0" }, { "checksumSHA1": "0ZrwvB6KoGPj2PoDNSEJwxQ6Mog=", From a204a1dce9c32044f507cc477d7e4f6bc07fbdaf Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 4 Sep 2018 20:00:30 -0400 Subject: [PATCH 048/184] vendor: Pin hashicorp/logutils@v1.0.0 Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/5773 * Updated via `govendor fetch github.com/hashicorp/logutils/...@v1.0.0` --- vendor/github.com/hashicorp/logutils/go.mod | 1 + vendor/vendor.json | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 vendor/github.com/hashicorp/logutils/go.mod diff --git a/vendor/github.com/hashicorp/logutils/go.mod b/vendor/github.com/hashicorp/logutils/go.mod new file mode 100644 index 00000000000..ba38a457646 --- /dev/null +++ b/vendor/github.com/hashicorp/logutils/go.mod @@ -0,0 +1 @@ +module github.com/hashicorp/logutils diff --git a/vendor/vendor.json b/vendor/vendor.json index 8f096cdcfbe..17d2528003e 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -1311,10 +1311,12 @@ "revisionTime": "2017-05-12T21:33:05Z" }, { - "checksumSHA1": "vt+P9D2yWDO3gdvdgCzwqunlhxU=", + "checksumSHA1": "v8LPIrksMLyWuVyNVJul0BbQONM=", "path": "github.com/hashicorp/logutils", - "revision": "0dc08b1671f34c4250ce212759ebd880f743d883", - "revisionTime": "2015-06-09T07:04:31Z" + "revision": "a335183dfd075f638afcc820c90591ca3c97eba6", + "revisionTime": "2018-08-28T16:12:49Z", + "version": "v1.0.0", + "versionExact": "v1.0.0" }, { "checksumSHA1": "MpMvoeVDNxeoOQTI+hUxt+0bHdY=", From e080df37494024cc0e1a6ce50e710338af551eeb Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 4 Sep 2018 20:04:42 -0400 Subject: [PATCH 049/184] vendor: Pin hashicorp/go-safetemp@v1.0.0 Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/5773 * Updated via: `govendor fetch github.com/hashicorp/go-safetemp/...@v1.0.0` --- vendor/github.com/hashicorp/go-safetemp/go.mod | 1 + vendor/vendor.json | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 vendor/github.com/hashicorp/go-safetemp/go.mod diff --git a/vendor/github.com/hashicorp/go-safetemp/go.mod b/vendor/github.com/hashicorp/go-safetemp/go.mod new file mode 100644 index 00000000000..02bc5f5bb55 --- /dev/null +++ b/vendor/github.com/hashicorp/go-safetemp/go.mod @@ -0,0 +1 @@ +module github.com/hashicorp/go-safetemp diff --git a/vendor/vendor.json b/vendor/vendor.json index 8f096cdcfbe..9631213bddb 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -1178,10 +1178,12 @@ "revisionTime": "2017-08-16T15:18:19Z" }, { - "checksumSHA1": "CduvzBFfTv77nhjtXPGdIjQQLMI=", + "checksumSHA1": "0daDqRBckum49dBVYduwjaoObgU=", "path": "github.com/hashicorp/go-safetemp", - "revision": "b1a1dbde6fdc11e3ae79efd9039009e22d4ae240", - "revisionTime": "2018-03-26T21:11:50Z" + "revision": "c9a55de4fe06c920a71964b53cfe3dd293a3c743", + "revisionTime": "2018-08-28T16:41:30Z", + "version": "v1.0.0", + "versionExact": "v1.0.0" }, { "checksumSHA1": "85XUnluYJL7F55ptcwdmN8eSOsk=", From 7dfdde3cedea7dfffe9e44c0135339be016340be Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 4 Sep 2018 20:15:23 -0400 Subject: [PATCH 050/184] vendor: Pin mitchellh/go-homedir@v1.0.0 Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/5773 * Updated via: `govendor fetch github.com/mitchellh/go-homedir/...@v1.0.0` --- vendor/github.com/mitchellh/go-homedir/go.mod | 1 + vendor/vendor.json | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 vendor/github.com/mitchellh/go-homedir/go.mod diff --git a/vendor/github.com/mitchellh/go-homedir/go.mod b/vendor/github.com/mitchellh/go-homedir/go.mod new file mode 100644 index 00000000000..7efa09a0432 --- /dev/null +++ b/vendor/github.com/mitchellh/go-homedir/go.mod @@ -0,0 +1 @@ +module github.com/mitchellh/go-homedir diff --git a/vendor/vendor.json b/vendor/vendor.json index 8f096cdcfbe..abec78979ce 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -1688,10 +1688,12 @@ "revisionTime": "2017-05-25T01:39:02Z" }, { - "checksumSHA1": "Li0PaRmaVBdibS/zs8myzc07L6o=", + "checksumSHA1": "a58zUNtDH/gEd6F6KI3FqT2iEo0=", "path": "github.com/mitchellh/go-homedir", - "revision": "58046073cbffe2f25d425fe1331102f55cf719de", - "revisionTime": "2018-08-01T23:32:06Z" + "revision": "ae18d6b8b3205b561c79e8e5f69bff09736185f4", + "revisionTime": "2018-08-24T00:42:36Z", + "version": "v1.0.0", + "versionExact": "v1.0.0" }, { "checksumSHA1": "bDdhmDk8q6utWrccBhEOa6IoGkE=", From 271b6f9ed10f9ae73da74db61f578ded894224d9 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 4 Sep 2018 20:27:55 -0400 Subject: [PATCH 051/184] vendor: Pin mitchellh/copystructure@v1.0.0 and mitchellh/reflectwalk@v1.0.0 Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/5773 * Updated via: ```govendor fetch github.com/mitchellh/copystructure/...@v1.0.0 govendor fetch github.com/mitchellh/reflectwalk/...@v1.0.0 ``` --- vendor/github.com/mitchellh/copystructure/go.mod | 3 +++ vendor/github.com/mitchellh/copystructure/go.sum | 2 ++ vendor/github.com/mitchellh/reflectwalk/go.mod | 1 + vendor/vendor.json | 16 ++++++++++------ 4 files changed, 16 insertions(+), 6 deletions(-) create mode 100644 vendor/github.com/mitchellh/copystructure/go.mod create mode 100644 vendor/github.com/mitchellh/copystructure/go.sum create mode 100644 vendor/github.com/mitchellh/reflectwalk/go.mod diff --git a/vendor/github.com/mitchellh/copystructure/go.mod b/vendor/github.com/mitchellh/copystructure/go.mod new file mode 100644 index 00000000000..d01864309b4 --- /dev/null +++ b/vendor/github.com/mitchellh/copystructure/go.mod @@ -0,0 +1,3 @@ +module github.com/mitchellh/copystructure + +require github.com/mitchellh/reflectwalk v1.0.0 diff --git a/vendor/github.com/mitchellh/copystructure/go.sum b/vendor/github.com/mitchellh/copystructure/go.sum new file mode 100644 index 00000000000..be572456190 --- /dev/null +++ b/vendor/github.com/mitchellh/copystructure/go.sum @@ -0,0 +1,2 @@ +github.com/mitchellh/reflectwalk v1.0.0 h1:9D+8oIskB4VJBN5SFlmc27fSlIBZaov1Wpk/IfikLNY= +github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= diff --git a/vendor/github.com/mitchellh/reflectwalk/go.mod b/vendor/github.com/mitchellh/reflectwalk/go.mod new file mode 100644 index 00000000000..52bb7c469e9 --- /dev/null +++ b/vendor/github.com/mitchellh/reflectwalk/go.mod @@ -0,0 +1 @@ +module github.com/mitchellh/reflectwalk diff --git a/vendor/vendor.json b/vendor/vendor.json index 8f096cdcfbe..39cc318ca5d 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -1682,10 +1682,12 @@ "revisionTime": "2017-08-03T04:29:10Z" }, { - "checksumSHA1": "+p4JY4wmFQAppCdlrJ8Kxybmht8=", + "checksumSHA1": "gpgfDOKGUOP/h+j1cM7T36NZFTQ=", "path": "github.com/mitchellh/copystructure", - "revision": "d23ffcb85de31694d6ccaa23ccb4a03e55c1303f", - "revisionTime": "2017-05-25T01:39:02Z" + "revision": "9a1b6f44e8da0e0e374624fb0a825a231b00c537", + "revisionTime": "2018-08-24T00:35:38Z", + "version": "v1.0.0", + "versionExact": "v1.0.0" }, { "checksumSHA1": "Li0PaRmaVBdibS/zs8myzc07L6o=", @@ -1717,10 +1719,12 @@ "revisionTime": "2017-03-07T20:11:23Z" }, { - "checksumSHA1": "AMU63CNOg4XmIhVR/S/Xttt1/f0=", + "checksumSHA1": "nxuST3bjBv5uDVPzrX9wdruOwv0=", "path": "github.com/mitchellh/reflectwalk", - "revision": "63d60e9d0dbc60cf9164e6510889b0db6683d98c", - "revisionTime": "2017-07-26T20:21:17Z" + "revision": "eecee6c969c02c8cc2ae48e1e269843ae8590796", + "revisionTime": "2018-08-24T00:34:11Z", + "version": "v1.0.0", + "versionExact": "v1.0.0" }, { "checksumSHA1": "6OEUkwOM0qgI6YxR+BDEn6YMvpU=", From 1a4565b217ff796b6ce8b12765b0e2e5d75a1995 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 4 Sep 2018 21:14:19 -0400 Subject: [PATCH 052/184] vendor: apparentlymart/go-cidr@v1.0.0 Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/5773 * Updated via: `govendor fetch github.com/apparentlymart/go-cidr/...@v1.0.0` ``` $ make test TEST=./aws ==> Checking that code complies with gofmt requirements... go test ./aws -timeout=30s -parallel=4 ok github.com/terraform-providers/terraform-provider-aws/aws 2.503s ``` --- .../apparentlymart/go-cidr/cidr/cidr.go | 102 +++++++++++++++++- vendor/vendor.json | 8 +- 2 files changed, 105 insertions(+), 5 deletions(-) diff --git a/vendor/github.com/apparentlymart/go-cidr/cidr/cidr.go b/vendor/github.com/apparentlymart/go-cidr/cidr/cidr.go index a31cdec7732..c292db0ce07 100644 --- a/vendor/github.com/apparentlymart/go-cidr/cidr/cidr.go +++ b/vendor/github.com/apparentlymart/go-cidr/cidr/cidr.go @@ -71,8 +71,13 @@ func Host(base *net.IPNet, num int) (net.IP, error) { if numUint64 > maxHostNum { return nil, fmt.Errorf("prefix of %d does not accommodate a host numbered %d", parentLen, num) } - - return insertNumIntoIP(ip, num, 32), nil + var bitlength int + if ip.To4() != nil { + bitlength = 32 + } else { + bitlength = 128 + } + return insertNumIntoIP(ip, num, bitlength), nil } // AddressRange returns the first and last addresses in the given CIDR range. @@ -110,3 +115,96 @@ func AddressCount(network *net.IPNet) uint64 { prefixLen, bits := network.Mask.Size() return 1 << (uint64(bits) - uint64(prefixLen)) } + +//VerifyNoOverlap takes a list subnets and supernet (CIDRBlock) and verifies +//none of the subnets overlap and all subnets are in the supernet +//it returns an error if any of those conditions are not satisfied +func VerifyNoOverlap(subnets []*net.IPNet, CIDRBlock *net.IPNet) error { + firstLastIP := make([][]net.IP, len(subnets)) + for i, s := range subnets { + first, last := AddressRange(s) + firstLastIP[i] = []net.IP{first, last} + } + for i, s := range subnets { + if !CIDRBlock.Contains(firstLastIP[i][0]) || !CIDRBlock.Contains(firstLastIP[i][1]) { + return fmt.Errorf("%s does not fully contain %s", CIDRBlock.String(), s.String()) + } + for j := i + 1; j < len(subnets); j++ { + first := firstLastIP[j][0] + last := firstLastIP[j][1] + if s.Contains(first) || s.Contains(last) { + return fmt.Errorf("%s overlaps with %s", subnets[j].String(), s.String()) + } + } + } + return nil +} + +// PreviousSubnet returns the subnet of the desired mask in the IP space +// just lower than the start of IPNet provided. If the IP space rolls over +// then the second return value is true +func PreviousSubnet(network *net.IPNet, prefixLen int) (*net.IPNet, bool) { + startIP := checkIPv4(network.IP) + previousIP := make(net.IP, len(startIP)) + copy(previousIP, startIP) + cMask := net.CIDRMask(prefixLen, 8*len(previousIP)) + previousIP = Dec(previousIP) + previous := &net.IPNet{IP: previousIP.Mask(cMask), Mask: cMask} + if startIP.Equal(net.IPv4zero) || startIP.Equal(net.IPv6zero) { + return previous, true + } + return previous, false +} + +// NextSubnet returns the next available subnet of the desired mask size +// starting for the maximum IP of the offset subnet +// If the IP exceeds the maxium IP then the second return value is true +func NextSubnet(network *net.IPNet, prefixLen int) (*net.IPNet, bool) { + _, currentLast := AddressRange(network) + mask := net.CIDRMask(prefixLen, 8*len(currentLast)) + currentSubnet := &net.IPNet{IP: currentLast.Mask(mask), Mask: mask} + _, last := AddressRange(currentSubnet) + last = Inc(last) + next := &net.IPNet{IP: last.Mask(mask), Mask: mask} + if last.Equal(net.IPv4zero) || last.Equal(net.IPv6zero) { + return next, true + } + return next, false +} + +//Inc increases the IP by one this returns a new []byte for the IP +func Inc(IP net.IP) net.IP { + IP = checkIPv4(IP) + incIP := make([]byte, len(IP)) + copy(incIP, IP) + for j := len(incIP) - 1; j >= 0; j-- { + incIP[j]++ + if incIP[j] > 0 { + break + } + } + return incIP +} + +//Dec decreases the IP by one this returns a new []byte for the IP +func Dec(IP net.IP) net.IP { + IP = checkIPv4(IP) + decIP := make([]byte, len(IP)) + copy(decIP, IP) + decIP = checkIPv4(decIP) + for j := len(decIP) - 1; j >= 0; j-- { + decIP[j]-- + if decIP[j] < 255 { + break + } + } + return decIP +} + +func checkIPv4(ip net.IP) net.IP { + // Go for some reason allocs IPv6len for IPv4 so we have to correct it + if v4 := ip.To4(); v4 != nil { + return v4 + } + return ip +} diff --git a/vendor/vendor.json b/vendor/vendor.json index 8f096cdcfbe..4df143fc7f0 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -21,10 +21,12 @@ "revisionTime": "2015-08-30T18:26:16Z" }, { - "checksumSHA1": "FIL83loX9V9APvGQIjJpbxq53F0=", + "checksumSHA1": "nRnZ35uyYct3TL95z7DPJ/lSUNg=", "path": "github.com/apparentlymart/go-cidr/cidr", - "revision": "7e4b007599d4e2076d9a81be723b3912852dda2c", - "revisionTime": "2017-04-18T07:21:50Z" + "revision": "b1115bf8e14a60131a196f908223e4506b0ddc35", + "revisionTime": "2018-08-15T15:04:34Z", + "version": "v1.0.0", + "versionExact": "v1.0.0" }, { "checksumSHA1": "Ffhtm8iHH7l2ynVVOIGJE3eiuLA=", From 962b562b389b802e1426716dc8c562ef299e1f5a Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 4 Sep 2018 21:19:17 -0400 Subject: [PATCH 053/184] vendor: Pin apparentlymart/go-textseg@v1.0.0 Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/5773 * Updated via: `govendor fetch github.com/apparentlymart/go-textseg/...@v1.0.0` --- vendor/vendor.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/vendor/vendor.json b/vendor/vendor.json index 8f096cdcfbe..be590462806 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -29,8 +29,10 @@ { "checksumSHA1": "Ffhtm8iHH7l2ynVVOIGJE3eiuLA=", "path": "github.com/apparentlymart/go-textseg/textseg", - "revision": "b836f5c4d331d1945a2fead7188db25432d73b69", - "revisionTime": "2017-05-31T20:39:52Z" + "revision": "fb01f485ebef760e5ee06d55e1b07534dda2d295", + "revisionTime": "2018-08-15T02:43:44Z", + "version": "v1.0.0", + "versionExact": "v1.0.0" }, { "checksumSHA1": "GCTVJ1J/SGZstNZauuLAnTFOhGA=", From df3916e18a590808d51896d0ed838a6a3f646481 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 4 Sep 2018 21:26:10 -0400 Subject: [PATCH 054/184] vendor: armon/go-radix@v1.0.0 Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/5773 * Updated via: `govendor fetch github.com/armon/go-radix/...@v1.0.0` ``` $ make test TEST=./aws ==> Checking that code complies with gofmt requirements... go test ./aws -timeout=30s -parallel=4 ok github.com/terraform-providers/terraform-provider-aws/aws 2.578s ``` --- vendor/github.com/armon/go-radix/go.mod | 1 + vendor/github.com/armon/go-radix/radix.go | 13 +++++-------- vendor/vendor.json | 8 +++++--- 3 files changed, 11 insertions(+), 11 deletions(-) create mode 100644 vendor/github.com/armon/go-radix/go.mod diff --git a/vendor/github.com/armon/go-radix/go.mod b/vendor/github.com/armon/go-radix/go.mod new file mode 100644 index 00000000000..4336aa29ea2 --- /dev/null +++ b/vendor/github.com/armon/go-radix/go.mod @@ -0,0 +1 @@ +module github.com/armon/go-radix diff --git a/vendor/github.com/armon/go-radix/radix.go b/vendor/github.com/armon/go-radix/radix.go index f9655a126b7..e2bb22eb91d 100644 --- a/vendor/github.com/armon/go-radix/radix.go +++ b/vendor/github.com/armon/go-radix/radix.go @@ -44,13 +44,13 @@ func (n *node) addEdge(e edge) { n.edges.Sort() } -func (n *node) replaceEdge(e edge) { +func (n *node) updateEdge(label byte, node *node) { num := len(n.edges) idx := sort.Search(num, func(i int) bool { - return n.edges[i].label >= e.label + return n.edges[i].label >= label }) - if idx < num && n.edges[idx].label == e.label { - n.edges[idx].node = e.node + if idx < num && n.edges[idx].label == label { + n.edges[idx].node = node return } panic("replacing missing edge") @@ -198,10 +198,7 @@ func (t *Tree) Insert(s string, v interface{}) (interface{}, bool) { child := &node{ prefix: search[:commonPrefix], } - parent.replaceEdge(edge{ - label: search[0], - node: child, - }) + parent.updateEdge(search[0], child) // Restore the existing node child.addEdge(edge{ diff --git a/vendor/vendor.json b/vendor/vendor.json index 8f096cdcfbe..8821937f6a9 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -33,10 +33,12 @@ "revisionTime": "2017-05-31T20:39:52Z" }, { - "checksumSHA1": "GCTVJ1J/SGZstNZauuLAnTFOhGA=", + "checksumSHA1": "ZWu+JUivE3zS4FZvVktFAWhj3FQ=", "path": "github.com/armon/go-radix", - "revision": "1fca145dffbcaa8fe914309b1ec0cfc67500fe61", - "revisionTime": "2017-07-27T15:54:43Z" + "revision": "1a2de0c21c94309923825da3df33a4381872c795", + "revisionTime": "2018-08-24T02:57:28Z", + "version": "v1.0.0", + "versionExact": "v1.0.0" }, { "checksumSHA1": "qO2na7vGPve58xAwBJziIc+BJb4=", From 023b767cbde7c87ab2e06eb1955718884539ef69 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 4 Sep 2018 21:32:23 -0400 Subject: [PATCH 055/184] vendor: Pin bgentry/speakeasy@v0.1.0 Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/5773 * Updated via: `govendor fetch github.com/bgentry/speakeasy/...@v0.1.0` --- vendor/vendor.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/vendor/vendor.json b/vendor/vendor.json index 8f096cdcfbe..0e6a6be4e42 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -1072,7 +1072,9 @@ "checksumSHA1": "oTmBS67uxM6OXB/+OJUAG9LK4jw=", "path": "github.com/bgentry/speakeasy", "revision": "4aabc24848ce5fd31929f7d1e4ea74d3709c14cd", - "revisionTime": "2017-04-17T20:07:03Z" + "revisionTime": "2017-04-17T20:07:03Z", + "version": "v0.1.0", + "versionExact": "v0.1.0" }, { "checksumSHA1": "OT4XN9z5k69e2RsMSpwW74B+yk4=", From 4093742325de9b3c1f1c68a0f56fe0c2771f29c3 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 4 Sep 2018 21:43:19 -0400 Subject: [PATCH 056/184] vendor: Pin hashicorp/errwrap@v1.0.0 and hashicorp/go-multierror@v1.0.0 Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/5773 * Updated via: ``` govendor fetch github.com/hashicorp/errwrap/...@v1.0.0 govendor fetch github.com/hashicorp/go-multierror/...@v1.0.0 ``` --- vendor/github.com/hashicorp/errwrap/README.md | 2 +- vendor/github.com/hashicorp/errwrap/go.mod | 1 + vendor/github.com/hashicorp/go-multierror/go.mod | 3 +++ vendor/github.com/hashicorp/go-multierror/go.sum | 4 ++++ vendor/vendor.json | 15 ++++++++++----- 5 files changed, 19 insertions(+), 6 deletions(-) create mode 100644 vendor/github.com/hashicorp/errwrap/go.mod create mode 100644 vendor/github.com/hashicorp/go-multierror/go.mod create mode 100644 vendor/github.com/hashicorp/go-multierror/go.sum diff --git a/vendor/github.com/hashicorp/errwrap/README.md b/vendor/github.com/hashicorp/errwrap/README.md index 1c95f59782b..444df08f8e7 100644 --- a/vendor/github.com/hashicorp/errwrap/README.md +++ b/vendor/github.com/hashicorp/errwrap/README.md @@ -48,7 +48,7 @@ func main() { // We can use the Contains helpers to check if an error contains // another error. It is safe to do this with a nil error, or with // an error that doesn't even use the errwrap package. - if errwrap.Contains(err, ErrNotExist) { + if errwrap.Contains(err, "does not exist") { // Do something } if errwrap.ContainsType(err, new(os.PathError)) { diff --git a/vendor/github.com/hashicorp/errwrap/go.mod b/vendor/github.com/hashicorp/errwrap/go.mod new file mode 100644 index 00000000000..c9b84022cf7 --- /dev/null +++ b/vendor/github.com/hashicorp/errwrap/go.mod @@ -0,0 +1 @@ +module github.com/hashicorp/errwrap diff --git a/vendor/github.com/hashicorp/go-multierror/go.mod b/vendor/github.com/hashicorp/go-multierror/go.mod new file mode 100644 index 00000000000..2534331d5f9 --- /dev/null +++ b/vendor/github.com/hashicorp/go-multierror/go.mod @@ -0,0 +1,3 @@ +module github.com/hashicorp/go-multierror + +require github.com/hashicorp/errwrap v1.0.0 diff --git a/vendor/github.com/hashicorp/go-multierror/go.sum b/vendor/github.com/hashicorp/go-multierror/go.sum new file mode 100644 index 00000000000..85b1f8ff333 --- /dev/null +++ b/vendor/github.com/hashicorp/go-multierror/go.sum @@ -0,0 +1,4 @@ +github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce h1:prjrVgOk2Yg6w+PflHoszQNLTUh4kaByUcEWM/9uin4= +github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA= +github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= diff --git a/vendor/vendor.json b/vendor/vendor.json index 8f096cdcfbe..780a3fb0f20 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -1135,9 +1135,12 @@ "revisionTime": "2018-05-18T05:39:59Z" }, { - "checksumSHA1": "cdOCt0Yb+hdErz8NAQqayxPmRsY=", + "checksumSHA1": "ByRdQMv2yl16W6Tp9gUW1nNmpuI=", "path": "github.com/hashicorp/errwrap", - "revision": "7554cd9344cec97297fa6649b055a8c98c2a1e55" + "revision": "8a6fb523712970c966eefc6b39ed2c5e74880354", + "revisionTime": "2018-08-24T00:39:10Z", + "version": "v1.0.0", + "versionExact": "v1.0.0" }, { "checksumSHA1": "Ihile6rE76J6SivxECovHgMROxw=", @@ -1166,10 +1169,12 @@ "revisionTime": "2017-10-05T15:17:51Z" }, { - "checksumSHA1": "K395EgrkkWtEFyuAv3WvPF95WN8=", + "checksumSHA1": "cFcwn0Zxefithm9Q9DioRNcGbqg=", "path": "github.com/hashicorp/go-multierror", - "revision": "3d5d8f294aa03d8e98859feac328afbdf1ae0703", - "revisionTime": "2018-07-17T15:01:48Z" + "revision": "886a7fbe3eb1c874d46f623bfa70af45f425b3d1", + "revisionTime": "2018-08-24T00:40:42Z", + "version": "v1.0.0", + "versionExact": "v1.0.0" }, { "checksumSHA1": "R6me0jVmcT/OPo80Fe0qo5fRwHc=", From 934a1e25340f49048fed30474c2598426cf1783b Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 4 Sep 2018 21:54:15 -0400 Subject: [PATCH 057/184] vendor: mattn/go-isatty@v0.0.4 Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/5773 * Updated via: `govendor fetch github.com/mattn/go-isatty/...@v0.0.4` --- .../mattn/go-isatty/isatty_linux.go | 2 +- .../mattn/go-isatty/isatty_linux_ppc64x.go | 19 +++++++++++++++++++ .../mattn/go-isatty/isatty_others.go | 2 +- vendor/vendor.json | 8 +++++--- 4 files changed, 26 insertions(+), 5 deletions(-) create mode 100644 vendor/github.com/mattn/go-isatty/isatty_linux_ppc64x.go diff --git a/vendor/github.com/mattn/go-isatty/isatty_linux.go b/vendor/github.com/mattn/go-isatty/isatty_linux.go index 9d24bac1db3..7384cf99167 100644 --- a/vendor/github.com/mattn/go-isatty/isatty_linux.go +++ b/vendor/github.com/mattn/go-isatty/isatty_linux.go @@ -1,5 +1,5 @@ // +build linux -// +build !appengine +// +build !appengine,!ppc64,!ppc64le package isatty diff --git a/vendor/github.com/mattn/go-isatty/isatty_linux_ppc64x.go b/vendor/github.com/mattn/go-isatty/isatty_linux_ppc64x.go new file mode 100644 index 00000000000..44e5d213021 --- /dev/null +++ b/vendor/github.com/mattn/go-isatty/isatty_linux_ppc64x.go @@ -0,0 +1,19 @@ +// +build linux +// +build ppc64 ppc64le + +package isatty + +import ( + "unsafe" + + syscall "golang.org/x/sys/unix" +) + +const ioctlReadTermios = syscall.TCGETS + +// IsTerminal return true if the file descriptor is terminal. +func IsTerminal(fd uintptr) bool { + var termios syscall.Termios + _, _, err := syscall.Syscall6(syscall.SYS_IOCTL, fd, ioctlReadTermios, uintptr(unsafe.Pointer(&termios)), 0, 0, 0) + return err == 0 +} diff --git a/vendor/github.com/mattn/go-isatty/isatty_others.go b/vendor/github.com/mattn/go-isatty/isatty_others.go index ff4de3d9a53..9d8b4a59961 100644 --- a/vendor/github.com/mattn/go-isatty/isatty_others.go +++ b/vendor/github.com/mattn/go-isatty/isatty_others.go @@ -3,7 +3,7 @@ package isatty -// IsCygwinTerminal() return true if the file descriptor is a cygwin or msys2 +// IsCygwinTerminal return true if the file descriptor is a cygwin or msys2 // terminal. This is also always false on this environment. func IsCygwinTerminal(fd uintptr) bool { return false diff --git a/vendor/vendor.json b/vendor/vendor.json index 8f096cdcfbe..5667a69d9ed 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -1670,10 +1670,12 @@ "revisionTime": "2016-10-04T15:35:44Z" }, { - "checksumSHA1": "trzmsZQDCc13zk/6qANox7Z/KCg=", + "checksumSHA1": "AZO2VGorXTMDiSVUih3k73vORHY=", "path": "github.com/mattn/go-isatty", - "revision": "fc9e8d8ef48496124e79ae0df75490096eccf6fe", - "revisionTime": "2017-03-22T23:44:13Z" + "revision": "6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c", + "revisionTime": "2017-11-07T05:05:31Z", + "version": "v0.0.4", + "versionExact": "v0.0.4" }, { "checksumSHA1": "jXakiCRizt6jtyeGh+DeuA76Bh0=", From d9a09d10d2a673e92ea4a4cf8e572e49d26256f7 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 4 Sep 2018 21:58:58 -0400 Subject: [PATCH 058/184] vendor: Pin ulikunitz/xz@v0.5.4 Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/5773 * Updated via: `govendor fetch github.com/ulikunitz/xz/...@v0.5.4` --- vendor/vendor.json | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/vendor/vendor.json b/vendor/vendor.json index 8f096cdcfbe..3dd17d0f451 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -1766,25 +1766,33 @@ "checksumSHA1": "qgMa75aMGbkFY0jIqqqgVnCUoNA=", "path": "github.com/ulikunitz/xz", "revision": "0c6b41e72360850ca4f98dc341fd999726ea007f", - "revisionTime": "2017-06-05T21:53:11Z" + "revisionTime": "2017-06-05T21:53:11Z", + "version": "v0.5.4", + "versionExact": "v0.5.4" }, { "checksumSHA1": "vjnTkzNrMs5Xj6so/fq0mQ6dT1c=", "path": "github.com/ulikunitz/xz/internal/hash", "revision": "0c6b41e72360850ca4f98dc341fd999726ea007f", - "revisionTime": "2017-06-05T21:53:11Z" + "revisionTime": "2017-06-05T21:53:11Z", + "version": "v0.5.4", + "versionExact": "v0.5.4" }, { "checksumSHA1": "m0pm57ASBK/CTdmC0ppRHO17mBs=", "path": "github.com/ulikunitz/xz/internal/xlog", "revision": "0c6b41e72360850ca4f98dc341fd999726ea007f", - "revisionTime": "2017-06-05T21:53:11Z" + "revisionTime": "2017-06-05T21:53:11Z", + "version": "v0.5.4", + "versionExact": "v0.5.4" }, { "checksumSHA1": "2vZw6zc8xuNlyVz2QKvdlNSZQ1U=", "path": "github.com/ulikunitz/xz/lzma", "revision": "0c6b41e72360850ca4f98dc341fd999726ea007f", - "revisionTime": "2017-06-05T21:53:11Z" + "revisionTime": "2017-06-05T21:53:11Z", + "version": "v0.5.4", + "versionExact": "v0.5.4" }, { "checksumSHA1": "TudZOVOvOvR5zw7EFbvD3eZpmLI=", From ca65e518daf0551e9e2c6ca1fe28a84a503c5391 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 4 Sep 2018 22:07:13 -0400 Subject: [PATCH 059/184] vendor: Pin agext/levenshtein@v1.2.1 Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/5773 * Updated via: `govendor fetch github.com/agext/levenshtein/...@v1.2.1` --- vendor/vendor.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/vendor/vendor.json b/vendor/vendor.json index 8f096cdcfbe..d6fca683373 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -6,7 +6,9 @@ "checksumSHA1": "jQh1fnoKPKMURvKkpdRjN695nAQ=", "path": "github.com/agext/levenshtein", "revision": "5f10fee965225ac1eecdc234c09daf5cd9e7f7b6", - "revisionTime": "2017-02-17T06:30:20Z" + "revisionTime": "2017-02-17T06:30:20Z", + "version": "v1.2.1", + "versionExact": "v1.2.1" }, { "checksumSHA1": "LLVyR2dAgkihu0+HdZF+JK0gMMs=", From ddaaae1d95fbb931b6c5edb4c2e727939fdb1089 Mon Sep 17 00:00:00 2001 From: saravanan30erd Date: Wed, 5 Sep 2018 15:57:05 +0400 Subject: [PATCH 060/184] fix the panic error --- aws/resource_aws_lambda_function.go | 70 +++++++++++++++-------------- 1 file changed, 37 insertions(+), 33 deletions(-) diff --git a/aws/resource_aws_lambda_function.go b/aws/resource_aws_lambda_function.go index 8144b2aedb2..3a39bba01fc 100644 --- a/aws/resource_aws_lambda_function.go +++ b/aws/resource_aws_lambda_function.go @@ -308,26 +308,28 @@ func resourceAwsLambdaFunctionCreate(d *schema.ResourceData, meta interface{}) e if v, ok := d.GetOk("vpc_config"); ok { configs := v.([]interface{}) - config, ok := configs[0].(map[string]interface{}) + if len(configs) == 1 { + config, ok := configs[0].(map[string]interface{}) - if !ok { - return errors.New("vpc_config is ") - } - - if config != nil { - var subnetIds []*string - for _, id := range config["subnet_ids"].(*schema.Set).List() { - subnetIds = append(subnetIds, aws.String(id.(string))) + if !ok { + return errors.New("vpc_config is ") } - var securityGroupIds []*string - for _, id := range config["security_group_ids"].(*schema.Set).List() { - securityGroupIds = append(securityGroupIds, aws.String(id.(string))) - } + if config != nil { + var subnetIds []*string + for _, id := range config["subnet_ids"].(*schema.Set).List() { + subnetIds = append(subnetIds, aws.String(id.(string))) + } + + var securityGroupIds []*string + for _, id := range config["security_group_ids"].(*schema.Set).List() { + securityGroupIds = append(securityGroupIds, aws.String(id.(string))) + } - params.VpcConfig = &lambda.VpcConfig{ - SubnetIds: subnetIds, - SecurityGroupIds: securityGroupIds, + params.VpcConfig = &lambda.VpcConfig{ + SubnetIds: subnetIds, + SecurityGroupIds: securityGroupIds, + } } } } @@ -681,27 +683,29 @@ func resourceAwsLambdaFunctionUpdate(d *schema.ResourceData, meta interface{}) e } if d.HasChange("vpc_config") { vpcConfigRaw := d.Get("vpc_config").([]interface{}) - vpcConfig, ok := vpcConfigRaw[0].(map[string]interface{}) - if !ok { - return errors.New("vpc_config is ") - } - - if vpcConfig != nil { - var subnetIds []*string - for _, id := range vpcConfig["subnet_ids"].(*schema.Set).List() { - subnetIds = append(subnetIds, aws.String(id.(string))) + if len(vpcConfigRaw) == 1 { // Schema guarantees either 0 or 1 + vpcConfig, ok := vpcConfigRaw[0].(map[string]interface{}) + if !ok { + return errors.New("vpc_config is ") } - var securityGroupIds []*string - for _, id := range vpcConfig["security_group_ids"].(*schema.Set).List() { - securityGroupIds = append(securityGroupIds, aws.String(id.(string))) - } + if vpcConfig != nil { + var subnetIds []*string + for _, id := range vpcConfig["subnet_ids"].(*schema.Set).List() { + subnetIds = append(subnetIds, aws.String(id.(string))) + } - configReq.VpcConfig = &lambda.VpcConfig{ - SubnetIds: subnetIds, - SecurityGroupIds: securityGroupIds, + var securityGroupIds []*string + for _, id := range vpcConfig["security_group_ids"].(*schema.Set).List() { + securityGroupIds = append(securityGroupIds, aws.String(id.(string))) + } + + configReq.VpcConfig = &lambda.VpcConfig{ + SubnetIds: subnetIds, + SecurityGroupIds: securityGroupIds, + } + configUpdate = true } - configUpdate = true } } From c5a97f57782ec580e30c57d06f2a422408226ead Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 5 Sep 2018 09:18:06 -0400 Subject: [PATCH 061/184] docs/provider: Update skip_requesting_account_id affected resources --- website/docs/index.html.markdown | 53 ++++++++++++++++++++++++-------- 1 file changed, 40 insertions(+), 13 deletions(-) diff --git a/website/docs/index.html.markdown b/website/docs/index.html.markdown index 50adcf955c7..438d805358d 100644 --- a/website/docs/index.html.markdown +++ b/website/docs/index.html.markdown @@ -209,19 +209,46 @@ In addition to [generic `provider` arguments](https://www.terraform.io/docs/conf * `skip_requesting_account_id` - (Optional) Skip requesting the account ID. Useful for AWS API implementations that do not have the IAM, STS - API, or metadata API. When set to `true`, prevents you from managing - any resource that requires Account ID to construct an ARN, e.g. - - `aws_db_instance` - - `aws_db_option_group` - - `aws_db_parameter_group` - - `aws_db_security_group` - - `aws_db_subnet_group` - - `aws_elasticache_cluster` - - `aws_glacier_vault` - - `aws_rds_cluster` - - `aws_rds_cluster_instance` - - `aws_rds_cluster_parameter_group` - - `aws_redshift_cluster` + API, or metadata API. When set to `true` and not determined previously, + returns an empty account ID when manually constructing ARN attributes with + the following: + - [`aws_api_gateway_deployment` resource](/docs/providers/aws/r/api_gateway_deployment.html) + - [`aws_api_gateway_rest_api` resource](/docs/providers/aws/r/api_gateway_rest_api.html) + - [`aws_api_gateway_stage` resource](/docs/providers/aws/r/api_gateway_stage.html) + - [`aws_budgets_budget` resource](/docs/providers/aws/r/budgets_budget.html) + - [`aws_cognito_identity_pool` resource](/docs/providers/aws/r/cognito_identity_pool.html) + - [`aws_cognito_user_pool` resource](/docs/providers/aws/r/cognito_user_pool.html) + - [`aws_cognito_user_pools` data source](/docs/providers/aws/d/cognito_user_pools.html) + - [`aws_dms_replication_subnet_group` resource](/docs/providers/aws/r/dms_replication_subnet_group.html) + - [`aws_dx_connection` resource](/docs/providers/aws/r/dx_connection.html) + - [`aws_dx_hosted_private_virtual_interface_accepter` resource](/docs/providers/aws/r/dx_hosted_private_virtual_interface_accepter.html) + - [`aws_dx_hosted_private_virtual_interface` resource](/docs/providers/aws/r/dx_hosted_private_virtual_interface.html) + - [`aws_dx_hosted_public_virtual_interface_accepter` resource](/docs/providers/aws/r/dx_hosted_public_virtual_interface_accepter.html) + - [`aws_dx_hosted_public_virtual_interface` resource](/docs/providers/aws/r/dx_hosted_public_virtual_interface.html) + - [`aws_dx_lag` resource](/docs/providers/aws/r/dx_lag.html) + - [`aws_dx_private_virtual_interface` resource](/docs/providers/aws/r/dx_private_virtual_interface.html) + - [`aws_dx_public_virtual_interface` resource](/docs/providers/aws/r/dx_public_virtual_interface.html) + - [`aws_ebs_volume` data source](/docs/providers/aws/d/ebs_volume.html) + - [`aws_ecs_cluster` resource (import)](/docs/providers/aws/r/ecs_cluster.html) + - [`aws_ecs_service` resource (import)](/docs/providers/aws/r/ecs_service.html) + - [`aws_elasticache_cluster` data source](/docs/providers/aws/d/elasticache_cluster.html) + - [`aws_elasticache_cluster` resource](/docs/providers/aws/r/elasticache_cluster.html) + - [`aws_elb` resource](/docs/providers/aws/r/elb.html) + - [`aws_instance` data source](/docs/providers/aws/d/instance.html) + - [`aws_instance` resource](/docs/providers/aws/r/instance.html) + - [`aws_launch_template` resource](/docs/providers/aws/r/launch_template.html) + - [`aws_redshift_cluster` resource](/docs/providers/aws/r/redshift_cluster.html) + - [`aws_redshift_subnet_group` resource](/docs/providers/aws/r/redshift_subnet_group.html) + - [`aws_ses_domain_identity_verification` resource](/docs/providers/aws/r/ses_domain_identity_verification.html) + - [`aws_ses_domain_identity` resource](/docs/providers/aws/r/ses_domain_identity.html) + - [`aws_ssm_document` resource](/docs/providers/aws/r/ssm_document.html) + - [`aws_ssm_parameter` resource](/docs/providers/aws/r/ssm_parameter.html) + - [`aws_subnet` data source](/docs/providers/aws/d/subnet.html) + - [`aws_subnet` resource](/docs/providers/aws/r/subnet.html) + - [`aws_vpc` data source](/docs/providers/aws/d/vpc.html) + - [`aws_vpc` resource](/docs/providers/aws/r/vpc.html) + - [`aws_waf_ipset` resource](/docs/providers/aws/r/waf_ipset.html) + - [`aws_wafregional_ipset` resource](/docs/providers/aws/r/wafregional_ipset.html) * `skip_metadata_api_check` - (Optional) Skip the AWS Metadata API check. Useful for AWS API implementations that do not have a metadata From 274325a174be5dea21e1dea143af258f396c5940 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 5 Sep 2018 10:34:18 -0400 Subject: [PATCH 062/184] provider: WARN log instead of returning error with AWS account ID lookup logic Reinstates provider behavior previous to version 1.31.0 which silently allowed AWS account ID lookup failures during initialization. Since missing the AWS account ID in the provider has implications for quite a few data sources and resources, we will return the error in the next major version of the provider. * Replace error from provider AWS account ID lookup with WARN log message * Add information about change in behavior to Version 2 Upgrade Guide --- aws/config.go | 12 +++++++++++- website/docs/guides/version-2-upgrade.html.md | 19 +++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/aws/config.go b/aws/config.go index 4abe2ab9060..ddc5d88570f 100644 --- a/aws/config.go +++ b/aws/config.go @@ -448,10 +448,20 @@ func (c *Config) Client() (interface{}, error) { var err error client.accountid, client.partition, err = GetAccountIDAndPartition(client.iamconn, client.stsconn, cp.ProviderName) if err != nil { - return nil, fmt.Errorf("Failed getting account information via all available methods. Errors: %s", err) + // DEPRECATED: Next major version of the provider should return the error instead of logging + // if skip_request_account_id is not enabled. + log.Printf("[WARN] %s", fmt.Sprintf( + "AWS account ID not previously found and failed retrieving via all available methods. "+ + "This will return an error in the next major version of the AWS provider. "+ + "See https://www.terraform.io/docs/providers/aws/index.html#skip_requesting_account_id for workaround and implications. "+ + "Errors: %s", err)) } } + if client.accountid == "" { + log.Printf("[WARN] AWS account ID not found for provider. See https://www.terraform.io/docs/providers/aws/index.html#skip_requesting_account_id for implications.") + } + authErr := c.ValidateAccountId(client.accountid) if authErr != nil { return nil, authErr diff --git a/website/docs/guides/version-2-upgrade.html.md b/website/docs/guides/version-2-upgrade.html.md index 007a41d1137..15f98451edb 100644 --- a/website/docs/guides/version-2-upgrade.html.md +++ b/website/docs/guides/version-2-upgrade.html.md @@ -19,6 +19,7 @@ Upgrade topics: - [Provider Version Configuration](#provider-version-configuration) +- [Provider: Configuration](#provider-configuration) - [Data Source: aws_ami](#data-source-aws_ami) - [Data Source: aws_ami_ids](#data-source-aws_ami_ids) - [Data Source: aws_iam_role](#data-source-aws_iam_role) @@ -73,6 +74,24 @@ provider "aws" { } ``` +## Provider: Configuration + +### skip_requesting_account_id Argument Now Required to Skip Account ID Lookup Errors + +If the provider is unable to determine the AWS account ID from a provider assume role configuration or the STS GetCallerIdentity call used to verify the credentials (if `skip_credentials_validation = false`), it will attempt to lookup the AWS account ID via EC2 metadata, IAM GetUser, IAM ListRoles, and STS GetCallerIdentity. Previously, the provider would silently allow the failure of all the above methods. + +The provider will now return an error to ensure operators understand the implications of the missing AWS account ID in the provider. + +If necessary, the AWS account ID lookup logic can be skipped via: + +```hcl +provider "aws" { + # ... other configuration ... + + skip_requesting_account_id = true +} +``` + ## Data Source: aws_ami ### owners Argument Now Required From 5f4ec8259979749cd0926564ce8ee85b35abdcd4 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Sep 2018 11:29:57 -0400 Subject: [PATCH 063/184] Add support for EKS Platform Version. --- aws/data_source_aws_eks_cluster.go | 5 +++++ aws/data_source_aws_eks_cluster_test.go | 2 ++ aws/resource_aws_eks_cluster.go | 5 +++++ aws/resource_aws_eks_cluster_test.go | 1 + website/docs/d/eks_cluster.html.markdown | 1 + website/docs/r/eks_cluster.html.markdown | 1 + 6 files changed, 15 insertions(+) diff --git a/aws/data_source_aws_eks_cluster.go b/aws/data_source_aws_eks_cluster.go index c2dfbdfaf0f..b9d66b90c16 100644 --- a/aws/data_source_aws_eks_cluster.go +++ b/aws/data_source_aws_eks_cluster.go @@ -46,6 +46,10 @@ func dataSourceAwsEksCluster() *schema.Resource { ForceNew: true, ValidateFunc: validation.NoZeroValues, }, + "platform_version": { + Type: schema.TypeString, + Computed: true, + }, "role_arn": { Type: schema.TypeString, Computed: true, @@ -110,6 +114,7 @@ func dataSourceAwsEksClusterRead(d *schema.ResourceData, meta interface{}) error d.Set("created_at", aws.TimeValue(cluster.CreatedAt).String()) d.Set("endpoint", cluster.Endpoint) d.Set("name", cluster.Name) + d.Set("platform_version", cluster.PlatformVersion) d.Set("role_arn", cluster.RoleArn) d.Set("version", cluster.Version) diff --git a/aws/data_source_aws_eks_cluster_test.go b/aws/data_source_aws_eks_cluster_test.go index d224540029c..5153e89e420 100644 --- a/aws/data_source_aws_eks_cluster_test.go +++ b/aws/data_source_aws_eks_cluster_test.go @@ -2,6 +2,7 @@ package aws import ( "fmt" + "regexp" "testing" "github.com/hashicorp/terraform/helper/acctest" @@ -26,6 +27,7 @@ func TestAccAWSEksClusterDataSource_basic(t *testing.T) { resource.TestCheckResourceAttrPair(resourceName, "certificate_authority.0.data", dataSourceResourceName, "certificate_authority.0.data"), resource.TestCheckResourceAttrPair(resourceName, "created_at", dataSourceResourceName, "created_at"), resource.TestCheckResourceAttrPair(resourceName, "endpoint", dataSourceResourceName, "endpoint"), + resource.TestMatchResourceAttr(resourceName, "platform_version", regexp.MustCompile(`^eks\.\d+$`)), resource.TestCheckResourceAttrPair(resourceName, "role_arn", dataSourceResourceName, "role_arn"), resource.TestCheckResourceAttrPair(resourceName, "version", dataSourceResourceName, "version"), resource.TestCheckResourceAttr(dataSourceResourceName, "vpc_config.#", "1"), diff --git a/aws/resource_aws_eks_cluster.go b/aws/resource_aws_eks_cluster.go index 87abe5115f2..f2d1118893d 100644 --- a/aws/resource_aws_eks_cluster.go +++ b/aws/resource_aws_eks_cluster.go @@ -59,6 +59,10 @@ func resourceAwsEksCluster() *schema.Resource { ForceNew: true, ValidateFunc: validation.NoZeroValues, }, + "platform_version": { + Type: schema.TypeString, + Computed: true, + }, "role_arn": { Type: schema.TypeString, Required: true, @@ -195,6 +199,7 @@ func resourceAwsEksClusterRead(d *schema.ResourceData, meta interface{}) error { d.Set("created_at", aws.TimeValue(cluster.CreatedAt).String()) d.Set("endpoint", cluster.Endpoint) d.Set("name", cluster.Name) + d.Set("platform_version", cluster.PlatformVersion) d.Set("role_arn", cluster.RoleArn) d.Set("version", cluster.Version) diff --git a/aws/resource_aws_eks_cluster_test.go b/aws/resource_aws_eks_cluster_test.go index 583f90d11ab..9bba6bf37fc 100644 --- a/aws/resource_aws_eks_cluster_test.go +++ b/aws/resource_aws_eks_cluster_test.go @@ -91,6 +91,7 @@ func TestAccAWSEksCluster_basic(t *testing.T) { resource.TestCheckResourceAttrSet(resourceName, "certificate_authority.0.data"), resource.TestMatchResourceAttr(resourceName, "endpoint", regexp.MustCompile(`^https://`)), resource.TestCheckResourceAttr(resourceName, "name", rName), + resource.TestMatchResourceAttr(resourceName, "platform_version", regexp.MustCompile(`^eks\.\d+$`)), resource.TestMatchResourceAttr(resourceName, "role_arn", regexp.MustCompile(fmt.Sprintf("%s$", rName))), resource.TestMatchResourceAttr(resourceName, "version", regexp.MustCompile(`^\d+\.\d+$`)), resource.TestCheckResourceAttr(resourceName, "vpc_config.#", "1"), diff --git a/website/docs/d/eks_cluster.html.markdown b/website/docs/d/eks_cluster.html.markdown index 8d664aefa0c..3f146be6773 100644 --- a/website/docs/d/eks_cluster.html.markdown +++ b/website/docs/d/eks_cluster.html.markdown @@ -38,6 +38,7 @@ output "kubeconfig-certificate-authority-data" { * `data` - The base64 encoded certificate data required to communicate with your cluster. Add this to the `certificate-authority-data` section of the `kubeconfig` file for your cluster. * `created_at` - The Unix epoch time stamp in seconds for when the cluster was created. * `endpoint` - The endpoint for your Kubernetes API server. +* `platform_version` - The platform version for the cluster. * `role_arn` - The Amazon Resource Name (ARN) of the IAM role that provides permissions for the Kubernetes control plane to make calls to AWS API operations on your behalf. * `version` - The Kubernetes server version for the cluster. * `vpc_config` - Nested attribute containing VPC configuration for the cluster. diff --git a/website/docs/r/eks_cluster.html.markdown b/website/docs/r/eks_cluster.html.markdown index 4d63463199f..068d23a28cd 100644 --- a/website/docs/r/eks_cluster.html.markdown +++ b/website/docs/r/eks_cluster.html.markdown @@ -54,6 +54,7 @@ In addition to all arguments above, the following attributes are exported: * `certificate_authority` - Nested attribute containing `certificate-authority-data` for your cluster. * `data` - The base64 encoded certificate data required to communicate with your cluster. Add this to the `certificate-authority-data` section of the `kubeconfig` file for your cluster. * `endpoint` - The endpoint for your Kubernetes API server. +* `platform_version` - The platform version for the cluster. * `version` - The Kubernetes server version for the cluster. * `vpc_config` - Additional nested attributes: * `vpc_id` - The VPC associated with your cluster. From 2c9433d1eb168a3b3129900e29d358fed3bee80a Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 5 Sep 2018 13:23:48 -0400 Subject: [PATCH 064/184] resource/aws_lambda_function: Properly handle `vpc_config` removal Includes preventing panics as started by https://github.com/terraform-providers/terraform-provider-aws/pull/5792 * Adds acceptance test (`TestAccAWSLambdaFunction_VPCRemoval`) to cover `vpc_config` removal * Prevents panic when removing `vpc_config` * Properly handles vpc_config removal to prevent perpetual difference Previously: ``` --- FAIL: TestAccAWSLambdaFunction_VPCRemoval (42.52s) testing.go:527: Step 1 error: Check failed: Check 2/2 error: aws_lambda_function.lambda_function_test: Attribute 'vpc_config.#' expected "0", got "1" ``` Now: ``` --- PASS: TestAccAWSLambdaFunction_VPCRemoval (51.23s) ``` --- aws/resource_aws_lambda_function.go | 63 ++++++------------------ aws/resource_aws_lambda_function_test.go | 29 +++++++++++ 2 files changed, 43 insertions(+), 49 deletions(-) diff --git a/aws/resource_aws_lambda_function.go b/aws/resource_aws_lambda_function.go index 3a39bba01fc..586bf255c4a 100644 --- a/aws/resource_aws_lambda_function.go +++ b/aws/resource_aws_lambda_function.go @@ -305,32 +305,12 @@ func resourceAwsLambdaFunctionCreate(d *schema.ResourceData, meta interface{}) e } } - if v, ok := d.GetOk("vpc_config"); ok { + if v, ok := d.GetOk("vpc_config"); ok && len(v.([]interface{})) > 0 { + config := v.([]interface{})[0].(map[string]interface{}) - configs := v.([]interface{}) - if len(configs) == 1 { - config, ok := configs[0].(map[string]interface{}) - - if !ok { - return errors.New("vpc_config is ") - } - - if config != nil { - var subnetIds []*string - for _, id := range config["subnet_ids"].(*schema.Set).List() { - subnetIds = append(subnetIds, aws.String(id.(string))) - } - - var securityGroupIds []*string - for _, id := range config["security_group_ids"].(*schema.Set).List() { - securityGroupIds = append(securityGroupIds, aws.String(id.(string))) - } - - params.VpcConfig = &lambda.VpcConfig{ - SubnetIds: subnetIds, - SecurityGroupIds: securityGroupIds, - } - } + params.VpcConfig = &lambda.VpcConfig{ + SecurityGroupIds: expandStringSet(config["security_group_ids"].(*schema.Set)), + SubnetIds: expandStringSet(config["subnet_ids"].(*schema.Set)), } } @@ -682,31 +662,16 @@ func resourceAwsLambdaFunctionUpdate(d *schema.ResourceData, meta interface{}) e } } if d.HasChange("vpc_config") { - vpcConfigRaw := d.Get("vpc_config").([]interface{}) - if len(vpcConfigRaw) == 1 { // Schema guarantees either 0 or 1 - vpcConfig, ok := vpcConfigRaw[0].(map[string]interface{}) - if !ok { - return errors.New("vpc_config is ") - } - - if vpcConfig != nil { - var subnetIds []*string - for _, id := range vpcConfig["subnet_ids"].(*schema.Set).List() { - subnetIds = append(subnetIds, aws.String(id.(string))) - } - - var securityGroupIds []*string - for _, id := range vpcConfig["security_group_ids"].(*schema.Set).List() { - securityGroupIds = append(securityGroupIds, aws.String(id.(string))) - } - - configReq.VpcConfig = &lambda.VpcConfig{ - SubnetIds: subnetIds, - SecurityGroupIds: securityGroupIds, - } - configUpdate = true - } + configReq.VpcConfig = &lambda.VpcConfig{ + SecurityGroupIds: []*string{}, + SubnetIds: []*string{}, } + if v, ok := d.GetOk("vpc_config"); ok && len(v.([]interface{})) > 0 { + vpcConfig := v.([]interface{})[0].(map[string]interface{}) + configReq.VpcConfig.SecurityGroupIds = expandStringSet(vpcConfig["security_group_ids"].(*schema.Set)) + configReq.VpcConfig.SubnetIds = expandStringSet(vpcConfig["subnet_ids"].(*schema.Set)) + } + configUpdate = true } if d.HasChange("runtime") { diff --git a/aws/resource_aws_lambda_function_test.go b/aws/resource_aws_lambda_function_test.go index c1ddb8340f6..9813b0a0773 100644 --- a/aws/resource_aws_lambda_function_test.go +++ b/aws/resource_aws_lambda_function_test.go @@ -534,6 +534,35 @@ func TestAccAWSLambdaFunction_VPC(t *testing.T) { }) } +func TestAccAWSLambdaFunction_VPCRemoval(t *testing.T) { + var conf lambda.GetFunctionOutput + + rName := acctest.RandomWithPrefix("tf-acc-test") + resourceName := "aws_lambda_function.lambda_function_test" + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckLambdaFunctionDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSLambdaConfigWithVPC(rName, rName, rName, rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAwsLambdaFunctionExists(resourceName, rName, &conf), + resource.TestCheckResourceAttr(resourceName, "vpc_config.#", "1"), + ), + }, + { + Config: testAccAWSLambdaConfigBasic(rName, rName, rName, rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAwsLambdaFunctionExists(resourceName, rName, &conf), + resource.TestCheckResourceAttr(resourceName, "vpc_config.#", "0"), + ), + }, + }, + }) +} + func TestAccAWSLambdaFunction_VPCUpdate(t *testing.T) { var conf lambda.GetFunctionOutput From d08310366449eb7f1370ef3fd50ecdd1823d5fd8 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 5 Sep 2018 14:07:18 -0400 Subject: [PATCH 065/184] Update CHANGELOG for #5798 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 11443e72d79..71d986d995d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ ENHANCEMENTS: BUG FIXES: * resource/aws_ecr_repository: Use `RepositoryUri` instead of our building our own URI for the `repository_url` attribute (AWS China fix) [GH-5748] +* resource/aws_lambda_function: Properly handle `vpc_config` removal [GH-5798] * resource/aws_redshift_cluster: Properly force new resource when updating `availability_zone` argument [GH-5758] ## 1.34.0 (August 30, 2018) From 0cd38b7a107df8671c2968ffcd009e06d6977263 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 5 Sep 2018 15:00:48 -0400 Subject: [PATCH 066/184] Update CHANGELOG for #5797 --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 71d986d995d..ebfdd39598a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ENHANCEMENTS: +* data-source/aws_eks_cluster: Add `platform_version` attribute [GH-5797] +* resource/aws_eks_cluster: Add `platform_version` attribute [GH-5797] * resource/aws_iam_role: Allow empty string (`""`) value for `permissions_boundary` argument [GH-5740] BUG FIXES: From 87f94c13756034f496611f9af36be61013b26658 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 5 Sep 2018 14:43:30 -0400 Subject: [PATCH 067/184] resource/aws_lambda_function: Prevent potential panic with vpc_config DiffSuppressFunc and refactor for early returns --- aws/resource_aws_lambda_function.go | 31 +++++++++++------------------ 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/aws/resource_aws_lambda_function.go b/aws/resource_aws_lambda_function.go index c64a1fe945e..88377ab1547 100644 --- a/aws/resource_aws_lambda_function.go +++ b/aws/resource_aws_lambda_function.go @@ -154,29 +154,22 @@ func resourceAwsLambdaFunction() *schema.Resource { }, }, - // Suppress diffs if the VPC configuration is empty. + // Suppress diffs if the VPC configuration is provided, but empty + // which is a valid Lambda function configuration. e.g. + // vpc_config { + // security_group_ids = [] + // subnet_ids = [] + // } DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool { - if v, ok := d.GetOk("vpc_config"); ok { - configs := v.([]interface{}) - config, ok := configs[0].(map[string]interface{}) - - if !ok { - return true - } - - if config == nil { - return true - } - - securityGroups := config["security_group_ids"].(*schema.Set) - subnets := config["subnet_ids"].(*schema.Set) + if d.Id() == "" || old == "1" || new == "0" { + return false + } - if securityGroups.Len() == 0 && subnets.Len() == 0 { - return true - } + if d.HasChange("vpc_config.0.security_group_ids") || d.HasChange("vpc_config.0.subnet_ids") { + return false } - return false + return true }, }, "arn": { From d71eacae721c7fe8988115e39881e0d0babd1766 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 5 Sep 2018 23:27:59 -0400 Subject: [PATCH 068/184] Update CHANGELOG for #1341 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ebfdd39598a..3335f42aecb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ ENHANCEMENTS: * data-source/aws_eks_cluster: Add `platform_version` attribute [GH-5797] * resource/aws_eks_cluster: Add `platform_version` attribute [GH-5797] +* resource/aws_lambda_function: Allow empty lists for `vpc_config` `security_group_ids` and `subnet_ids` arguments to unconfigure VPC [GH-1341] * resource/aws_iam_role: Allow empty string (`""`) value for `permissions_boundary` argument [GH-5740] BUG FIXES: From 7a246a13e15a1ab9a63b311129279972ef7dc273 Mon Sep 17 00:00:00 2001 From: tf-release-bot Date: Thu, 6 Sep 2018 04:20:00 +0000 Subject: [PATCH 069/184] v1.35.0 --- CHANGELOG.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3335f42aecb..d4b925c8ac4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,17 +1,17 @@ -## 1.35.0 (Unreleased) +## 1.35.0 (September 06, 2018) ENHANCEMENTS: -* data-source/aws_eks_cluster: Add `platform_version` attribute [GH-5797] -* resource/aws_eks_cluster: Add `platform_version` attribute [GH-5797] -* resource/aws_lambda_function: Allow empty lists for `vpc_config` `security_group_ids` and `subnet_ids` arguments to unconfigure VPC [GH-1341] -* resource/aws_iam_role: Allow empty string (`""`) value for `permissions_boundary` argument [GH-5740] +* data-source/aws_eks_cluster: Add `platform_version` attribute ([#5797](https://github.com/terraform-providers/terraform-provider-aws/issues/5797)) +* resource/aws_eks_cluster: Add `platform_version` attribute ([#5797](https://github.com/terraform-providers/terraform-provider-aws/issues/5797)) +* resource/aws_lambda_function: Allow empty lists for `vpc_config` `security_group_ids` and `subnet_ids` arguments to unconfigure VPC ([#1341](https://github.com/terraform-providers/terraform-provider-aws/issues/1341)) +* resource/aws_iam_role: Allow empty string (`""`) value for `permissions_boundary` argument ([#5740](https://github.com/terraform-providers/terraform-provider-aws/issues/5740)) BUG FIXES: -* resource/aws_ecr_repository: Use `RepositoryUri` instead of our building our own URI for the `repository_url` attribute (AWS China fix) [GH-5748] -* resource/aws_lambda_function: Properly handle `vpc_config` removal [GH-5798] -* resource/aws_redshift_cluster: Properly force new resource when updating `availability_zone` argument [GH-5758] +* resource/aws_ecr_repository: Use `RepositoryUri` instead of our building our own URI for the `repository_url` attribute (AWS China fix) ([#5748](https://github.com/terraform-providers/terraform-provider-aws/issues/5748)) +* resource/aws_lambda_function: Properly handle `vpc_config` removal ([#5798](https://github.com/terraform-providers/terraform-provider-aws/issues/5798)) +* resource/aws_redshift_cluster: Properly force new resource when updating `availability_zone` argument ([#5758](https://github.com/terraform-providers/terraform-provider-aws/issues/5758)) ## 1.34.0 (August 30, 2018) From 4235dc3a2025ae9435806019ada7c96745c7968d Mon Sep 17 00:00:00 2001 From: tf-release-bot Date: Thu, 6 Sep 2018 04:28:00 +0000 Subject: [PATCH 070/184] Cleanup after v1.35.0 release --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d4b925c8ac4..7cf4f292000 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,4 @@ +## 1.36.0 (Unreleased) ## 1.35.0 (September 06, 2018) ENHANCEMENTS: From 1d6c005aab15786032c46cddf17f97d241e6feb2 Mon Sep 17 00:00:00 2001 From: kterada0509 Date: Thu, 6 Sep 2018 17:43:09 +0900 Subject: [PATCH 071/184] Add enabled_cloudwatch_logs_exports params to test resource --- aws/data_source_aws_db_instance_test.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/aws/data_source_aws_db_instance_test.go b/aws/data_source_aws_db_instance_test.go index 1879f0f27fd..3299d69bb8d 100644 --- a/aws/data_source_aws_db_instance_test.go +++ b/aws/data_source_aws_db_instance_test.go @@ -28,6 +28,8 @@ func TestAccAWSDbInstanceDataSource_basic(t *testing.T) { resource.TestCheckResourceAttrSet("data.aws_db_instance.bar", "hosted_zone_id"), resource.TestCheckResourceAttrSet("data.aws_db_instance.bar", "master_username"), resource.TestCheckResourceAttrSet("data.aws_db_instance.bar", "port"), + resource.TestCheckResourceAttrSet("data.aws_db_instance.bar", "enabled_cloudwatch_logs_exports.0"), + resource.TestCheckResourceAttrSet("data.aws_db_instance.bar", "enabled_cloudwatch_logs_exports.1"), ), }, }, @@ -69,6 +71,11 @@ resource "aws_db_instance" "bar" { backup_retention_period = 0 skip_final_snapshot = true + + enabled_cloudwatch_logs_exports = [ + "audit", + "error", + ] } data "aws_db_instance" "bar" { From b98c2ad54ebf6f0c9c167b7a9c98304b252d8ab3 Mon Sep 17 00:00:00 2001 From: kterada0509 Date: Thu, 6 Sep 2018 17:43:26 +0900 Subject: [PATCH 072/184] Add enabled_cloudwatch_logs_exports to data resource --- aws/data_source_aws_db_instance.go | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/aws/data_source_aws_db_instance.go b/aws/data_source_aws_db_instance.go index bf8df80ec92..2dee7c8e248 100644 --- a/aws/data_source_aws_db_instance.go +++ b/aws/data_source_aws_db_instance.go @@ -87,6 +87,12 @@ func dataSourceAwsDbInstance() *schema.Resource { Computed: true, }, + "enabled_cloudwatch_logs_exports": { + Type: schema.TypeList, + Computed: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, + "endpoint": { Type: schema.TypeString, Computed: true, @@ -272,6 +278,10 @@ func dataSourceAwsDbInstanceRead(d *schema.ResourceData, meta interface{}) error d.Set("hosted_zone_id", dbInstance.Endpoint.HostedZoneId) d.Set("endpoint", fmt.Sprintf("%s:%d", *dbInstance.Endpoint.Address, *dbInstance.Endpoint.Port)) + if err := d.Set("enabled_cloudwatch_logs_exports", aws.StringValueSlice(dbInstance.EnabledCloudwatchLogsExports)); err != nil { + return fmt.Errorf("error setting enabled_cloudwatch_logs_exports: %#v", err) + } + var optionGroups []string for _, v := range dbInstance.OptionGroupMemberships { optionGroups = append(optionGroups, *v.OptionGroupName) From 587f61192fc5bb84f7dd79b7eae9540410948761 Mon Sep 17 00:00:00 2001 From: kterada0509 Date: Thu, 6 Sep 2018 17:43:51 +0900 Subject: [PATCH 073/184] Add enabled_cloudwatch_logs_exports attribute to document --- website/docs/d/db_instance.html.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/website/docs/d/db_instance.html.markdown b/website/docs/d/db_instance.html.markdown index 1ec70886833..9127cf6281e 100644 --- a/website/docs/d/db_instance.html.markdown +++ b/website/docs/d/db_instance.html.markdown @@ -41,6 +41,7 @@ In addition to all arguments above, the following attributes are exported: * `db_security_groups` - Provides List of DB security groups associated to this DB instance. * `db_subnet_group` - Specifies the name of the subnet group associated with the DB instance. * `db_instance_port` - Specifies the port that the DB instance listens on. +* `enabled_cloudwatch_logs_exports` - List of log types to export to cloudwatch. * `endpoint` - The connection endpoint in `address:port` format. * `engine` - Provides the name of the database engine to be used for this DB instance. * `engine_version` - Indicates the database engine version. From 6c6ee97c5144fc218b3baea14e0d0f4791e778a6 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Thu, 6 Sep 2018 09:02:05 -0400 Subject: [PATCH 074/184] Update CHANGELOG for #5801 --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7cf4f292000..a7c1eab0568 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,9 @@ ## 1.36.0 (Unreleased) + +ENHANCEMENTS: + +* data-source/aws_db_instance: Add `enabled_cloudwatch_logs_exports` attribute [GH-5801] + ## 1.35.0 (September 06, 2018) ENHANCEMENTS: From 75d3eb501b8257f190560ddf1adb77bbdaee3d53 Mon Sep 17 00:00:00 2001 From: Bastiaan Schaap Date: Thu, 6 Sep 2018 15:24:27 +0200 Subject: [PATCH 075/184] Changes w/r to review comments --- aws/resource_aws_launch_template.go | 1 + aws/resource_aws_launch_template_test.go | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/aws/resource_aws_launch_template.go b/aws/resource_aws_launch_template.go index 7f148e6f33f..ca1fb2d662b 100644 --- a/aws/resource_aws_launch_template.go +++ b/aws/resource_aws_launch_template.go @@ -553,6 +553,7 @@ func resourceAwsLaunchTemplateRead(d *schema.ResourceData, meta interface{}) err d.Set("security_group_names", aws.StringValueSlice(ltData.SecurityGroups)) d.Set("user_data", ltData.UserData) d.Set("vpc_security_group_ids", aws.StringValueSlice(ltData.SecurityGroupIds)) + d.Set("ebs_optimized", "") if ltData.EbsOptimized != nil { d.Set("ebs_optimized", strconv.FormatBool(aws.BoolValue(ltData.EbsOptimized))) diff --git a/aws/resource_aws_launch_template_test.go b/aws/resource_aws_launch_template_test.go index 1181f193a7e..c151c15e709 100644 --- a/aws/resource_aws_launch_template_test.go +++ b/aws/resource_aws_launch_template_test.go @@ -29,6 +29,7 @@ func TestAccAWSLaunchTemplate_basic(t *testing.T) { resource.TestCheckResourceAttr(resName, "default_version", "1"), resource.TestCheckResourceAttr(resName, "latest_version", "1"), resource.TestCheckResourceAttrSet(resName, "arn"), + resource.TestCheckResourceAttr(resName, "ebs_optimized", ""), ), }, }, @@ -122,7 +123,7 @@ func TestAccAWSLaunchTemplate_data(t *testing.T) { resource.TestCheckResourceAttr(resName, "block_device_mappings.#", "1"), resource.TestCheckResourceAttr(resName, "credit_specification.#", "1"), resource.TestCheckResourceAttrSet(resName, "disable_api_termination"), - resource.TestCheckResourceAttrSet(resName, "ebs_optimized"), + resource.TestCheckResourceAttr(resName, "ebs_optimized", "false"), resource.TestCheckResourceAttr(resName, "elastic_gpu_specifications.#", "1"), resource.TestCheckResourceAttr(resName, "iam_instance_profile.#", "1"), resource.TestCheckResourceAttrSet(resName, "image_id"), From 5a55e2d2a3ced035017107650249c4b261e05199 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Thu, 6 Sep 2018 09:32:47 -0400 Subject: [PATCH 076/184] resource/aws_db_instance: Address #5378 PR feedback * Ensure d.Set() is always called for domain and domain_iam_role_name * Remove extraneous d.IsNewResource() check in Update function * Randomize IAM role naming for new domain acceptance tests --- aws/resource_aws_db_instance.go | 4 +++- aws/resource_aws_db_instance_test.go | 33 ++++++++++------------------ 2 files changed, 15 insertions(+), 22 deletions(-) diff --git a/aws/resource_aws_db_instance.go b/aws/resource_aws_db_instance.go index e338d571b29..fc3a25947fc 100644 --- a/aws/resource_aws_db_instance.go +++ b/aws/resource_aws_db_instance.go @@ -1179,6 +1179,8 @@ func resourceAwsDbInstanceRead(d *schema.ResourceData, meta interface{}) error { return fmt.Errorf("error setting enabled_cloudwatch_logs_exports: %s", err) } + d.Set("domain", "") + d.Set("domain_iam_role_name", "") if len(v.DomainMemberships) > 0 && v.DomainMemberships[0] != nil { d.Set("domain", v.DomainMemberships[0].Domain) d.Set("domain_iam_role_name", v.DomainMemberships[0].IAMRoleName) @@ -1443,7 +1445,7 @@ func resourceAwsDbInstanceUpdate(d *schema.ResourceData, meta interface{}) error requestUpdate = true } - if (d.HasChange("domain") || d.HasChange("domain_iam_role_name")) && !d.IsNewResource() { + if d.HasChange("domain") || d.HasChange("domain_iam_role_name") { d.SetPartial("domain") d.SetPartial("domain_iam_role_name") req.Domain = aws.String(d.Get("domain").(string)) diff --git a/aws/resource_aws_db_instance_test.go b/aws/resource_aws_db_instance_test.go index 3fc3ca9a7ae..90eaecda9a1 100644 --- a/aws/resource_aws_db_instance_test.go +++ b/aws/resource_aws_db_instance_test.go @@ -2586,7 +2586,7 @@ resource "aws_directory_service_directory" "bar" { } resource "aws_iam_role" "role" { - name = "tf-acc-db-instance-mssql-domain-role" + name = "tf-acc-db-instance-mssql-domain-role-%d" assume_role_policy = < Date: Thu, 6 Sep 2018 10:04:18 -0400 Subject: [PATCH 077/184] Update CHANGELOG for #5627 --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a7c1eab0568..11b11c25b3b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ ENHANCEMENTS: * data-source/aws_db_instance: Add `enabled_cloudwatch_logs_exports` attribute [GH-5801] +BUG FIXES: + +* resource/aws_launch_template: Ensure `ebs_optimized` argument accepts "unspecified" value [GH-5627] + ## 1.35.0 (September 06, 2018) ENHANCEMENTS: From 2bcb2446484e2f9a8b98af37918f2b4c21698cb8 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Thu, 6 Sep 2018 11:20:55 -0400 Subject: [PATCH 078/184] Update CHANGELOG for #5378 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 11b11c25b3b..b49e1d150b4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ENHANCEMENTS: * data-source/aws_db_instance: Add `enabled_cloudwatch_logs_exports` attribute [GH-5801] +* resource/aws_db_instance: Add `domain` and `domain_iam_role_name` arguments (support for domain joining RDS instances) [GH-5378] BUG FIXES: From ebcec59351110470974f8ace2c68c976877d6b4b Mon Sep 17 00:00:00 2001 From: saravanan30erd Date: Thu, 6 Sep 2018 20:23:04 +0400 Subject: [PATCH 079/184] T3 doesn't respect the credit_specification attr(fix) --- aws/resource_aws_instance.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/aws/resource_aws_instance.go b/aws/resource_aws_instance.go index 65637d7a05c..e5d69e0739f 100644 --- a/aws/resource_aws_instance.go +++ b/aws/resource_aws_instance.go @@ -1742,14 +1742,14 @@ func buildAwsInstanceOpts( } if v, ok := d.GetOk("credit_specification"); ok { - // Only T2 instances support T2 Unlimited - if strings.HasPrefix(instanceType, "t2") { + // Only T2 and T3 are burstable performance instance types and supports Unlimited + if strings.HasPrefix(instanceType, "t2") || strings.HasPrefix(instanceType, "t3") { cs := v.([]interface{})[0].(map[string]interface{}) opts.CreditSpecification = &ec2.CreditSpecificationRequest{ CpuCredits: aws.String(cs["cpu_credits"].(string)), } } else { - log.Print("[WARN] credit_specification is defined but instance type is not T2. Ignoring...") + log.Print("[WARN] credit_specification is defined but instance type is not T2/T3. Ignoring...") } } From 0e10d3a81a64ab9759e4a32fce0b491f858e661f Mon Sep 17 00:00:00 2001 From: saravanan30erd Date: Thu, 6 Sep 2018 22:40:45 +0400 Subject: [PATCH 080/184] set default value as unlimited for t3 instances --- aws/resource_aws_instance.go | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/aws/resource_aws_instance.go b/aws/resource_aws_instance.go index e5d69e0739f..c0b0645ba11 100644 --- a/aws/resource_aws_instance.go +++ b/aws/resource_aws_instance.go @@ -479,6 +479,13 @@ func resourceAwsInstance() *schema.Resource { Type: schema.TypeString, Optional: true, Default: "standard", + DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool { + if strings.HasPrefix(d.Get("instance_type").(string), "t3") && + old == "unlimited" && new == "standard" { + return true + } + return false + }, }, }, }, @@ -1741,6 +1748,13 @@ func buildAwsInstanceOpts( InstanceType: aws.String(instanceType), } + // Set default cpu_credits as Unlimited for T3 instance type + if strings.HasPrefix(instanceType, "t3") { + opts.CreditSpecification = &ec2.CreditSpecificationRequest{ + CpuCredits: aws.String("unlimited"), + } + } + if v, ok := d.GetOk("credit_specification"); ok { // Only T2 and T3 are burstable performance instance types and supports Unlimited if strings.HasPrefix(instanceType, "t2") || strings.HasPrefix(instanceType, "t3") { From 563b8a4ff70ea6c6ec6dbec0b4c2017db55338ec Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Thu, 6 Sep 2018 15:04:54 -0400 Subject: [PATCH 081/184] tests/data-source/aws_cloudformation_stack: Fix outputs.VPCId handling for longer VPC IDs AWS switched to longer IDs at some point and we don't particularly care how long they are. Previously: ``` --- FAIL: TestAccAWSCloudFormationStack_dataSource_basic (64.08s) testing.go:527: Step 0 error: Check failed: Check 2/11 error: data.aws_cloudformation_stack.network: Attribute 'outputs.VPCId' didn't match "^vpc-[a-z0-9]{8}$", got "vpc-06a0f633be3839442" --- FAIL: TestAccAWSCloudFormationStack_dataSource_yaml (54.21s) testing.go:527: Step 0 error: Check failed: Check 2/11 error: data.aws_cloudformation_stack.yaml: Attribute 'outputs.VPCId' didn't match "^vpc-[a-z0-9]{8}$", got "vpc-05022ffdfe3c092f8" ``` Now: ``` --- PASS: TestAccAWSCloudFormationStack_dataSource_basic (72.94s) --- PASS: TestAccAWSCloudFormationStack_dataSource_yaml (72.08s) ``` --- aws/data_source_aws_cloudformation_stack_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/aws/data_source_aws_cloudformation_stack_test.go b/aws/data_source_aws_cloudformation_stack_test.go index 0e6aa759c37..03cba304e4f 100644 --- a/aws/data_source_aws_cloudformation_stack_test.go +++ b/aws/data_source_aws_cloudformation_stack_test.go @@ -22,7 +22,7 @@ func TestAccAWSCloudFormationStack_dataSource_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttr("data.aws_cloudformation_stack.network", "outputs.%", "1"), resource.TestMatchResourceAttr("data.aws_cloudformation_stack.network", "outputs.VPCId", - regexp.MustCompile("^vpc-[a-z0-9]{8}$")), + regexp.MustCompile("^vpc-[a-z0-9]+")), resource.TestCheckResourceAttr("data.aws_cloudformation_stack.network", "capabilities.#", "0"), resource.TestCheckResourceAttr("data.aws_cloudformation_stack.network", "disable_rollback", "false"), resource.TestCheckResourceAttr("data.aws_cloudformation_stack.network", "notification_arns.#", "0"), @@ -97,7 +97,7 @@ func TestAccAWSCloudFormationStack_dataSource_yaml(t *testing.T) { Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttr("data.aws_cloudformation_stack.yaml", "outputs.%", "1"), resource.TestMatchResourceAttr("data.aws_cloudformation_stack.yaml", "outputs.VPCId", - regexp.MustCompile("^vpc-[a-z0-9]{8}$")), + regexp.MustCompile("^vpc-[a-z0-9]+")), resource.TestCheckResourceAttr("data.aws_cloudformation_stack.yaml", "capabilities.#", "0"), resource.TestCheckResourceAttr("data.aws_cloudformation_stack.yaml", "disable_rollback", "false"), resource.TestCheckResourceAttr("data.aws_cloudformation_stack.yaml", "notification_arns.#", "0"), From d66ceeefba40f4137d7f9ca8082390170d009115 Mon Sep 17 00:00:00 2001 From: saravanan30erd Date: Thu, 6 Sep 2018 23:18:12 +0400 Subject: [PATCH 082/184] acceptance tests to cover issues --- aws/resource_aws_instance_test.go | 168 ++++++++++++++++++++++++++++++ 1 file changed, 168 insertions(+) diff --git a/aws/resource_aws_instance_test.go b/aws/resource_aws_instance_test.go index 4c1141630f6..442241067bc 100644 --- a/aws/resource_aws_instance_test.go +++ b/aws/resource_aws_instance_test.go @@ -1602,6 +1602,99 @@ func TestAccAWSInstance_creditSpecification_isNotAppliedToNonBurstable(t *testin }) } +func TestAccAWSInstance_creditSpecificationT3_unspecifiedDefaultsToUnlimited(t *testing.T) { + var instance ec2.Instance + resName := "aws_instance.foo" + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckInstanceDestroy, + Steps: []resource.TestStep{ + { + Config: testAccInstanceConfig_creditSpecification_unspecified_t3(acctest.RandInt()), + Check: resource.ComposeTestCheckFunc( + testAccCheckInstanceExists(resName, &instance), + resource.TestCheckResourceAttr(resName, "credit_specification.#", "1"), + resource.TestCheckResourceAttr(resName, "credit_specification.0.cpu_credits", "unlimited"), + ), + }, + }, + }) +} + +func TestAccAWSInstance_creditSpecificationT3_standardCpuCredits(t *testing.T) { + var instance ec2.Instance + resName := "aws_instance.foo" + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckInstanceDestroy, + Steps: []resource.TestStep{ + { + Config: testAccInstanceConfig_creditSpecification_standardCpuCredits_t3(acctest.RandInt()), + Check: resource.ComposeTestCheckFunc( + testAccCheckInstanceExists(resName, &instance), + resource.TestCheckResourceAttr(resName, "credit_specification.#", "1"), + resource.TestCheckResourceAttr(resName, "credit_specification.0.cpu_credits", "standard"), + ), + }, + }, + }) +} + +func TestAccAWSInstance_creditSpecificationT3_unlimitedCpuCredits(t *testing.T) { + var instance ec2.Instance + resName := "aws_instance.foo" + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckInstanceDestroy, + Steps: []resource.TestStep{ + { + Config: testAccInstanceConfig_creditSpecification_unlimitedCpuCredits_t3(acctest.RandInt()), + Check: resource.ComposeTestCheckFunc( + testAccCheckInstanceExists(resName, &instance), + resource.TestCheckResourceAttr(resName, "credit_specification.#", "1"), + resource.TestCheckResourceAttr(resName, "credit_specification.0.cpu_credits", "unlimited"), + ), + }, + }, + }) +} + +func TestAccAWSInstance_creditSpecificationT3_updateCpuCredits(t *testing.T) { + var before ec2.Instance + var after ec2.Instance + resName := "aws_instance.foo" + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckInstanceDestroy, + Steps: []resource.TestStep{ + { + Config: testAccInstanceConfig_creditSpecification_standardCpuCredits_t3(acctest.RandInt()), + Check: resource.ComposeTestCheckFunc( + testAccCheckInstanceExists(resName, &before), + resource.TestCheckResourceAttr(resName, "credit_specification.#", "1"), + resource.TestCheckResourceAttr(resName, "credit_specification.0.cpu_credits", "standard"), + ), + }, + { + Config: testAccInstanceConfig_creditSpecification_unlimitedCpuCredits_t3(acctest.RandInt()), + Check: resource.ComposeTestCheckFunc( + testAccCheckInstanceExists(resName, &after), + resource.TestCheckResourceAttr(resName, "credit_specification.#", "1"), + resource.TestCheckResourceAttr(resName, "credit_specification.0.cpu_credits", "unlimited"), + ), + }, + }, + }) +} + func TestAccAWSInstance_UserData_EmptyStringToUnspecified(t *testing.T) { var instance ec2.Instance rInt := acctest.RandInt() @@ -3283,6 +3376,29 @@ resource "aws_instance" "foo" { `, rInt) } +func testAccInstanceConfig_creditSpecification_unspecified_t3(rInt int) string { + return fmt.Sprintf(` +resource "aws_vpc" "my_vpc" { + cidr_block = "172.16.0.0/16" + tags { + Name = "tf-acctest-%d" + } +} + +resource "aws_subnet" "my_subnet" { + vpc_id = "${aws_vpc.my_vpc.id}" + cidr_block = "172.16.20.0/24" + availability_zone = "us-west-2a" +} + +resource "aws_instance" "foo" { + ami = "ami-51537029" # us-west-2 + instance_type = "t3.micro" + subnet_id = "${aws_subnet.my_subnet.id}" +} +`, rInt) +} + func testAccInstanceConfig_creditSpecification_standardCpuCredits(rInt int) string { return fmt.Sprintf(` resource "aws_vpc" "my_vpc" { @@ -3309,6 +3425,32 @@ resource "aws_instance" "foo" { `, rInt) } +func testAccInstanceConfig_creditSpecification_standardCpuCredits_t3(rInt int) string { + return fmt.Sprintf(` +resource "aws_vpc" "my_vpc" { + cidr_block = "172.16.0.0/16" + tags { + Name = "tf-acctest-%d" + } +} + +resource "aws_subnet" "my_subnet" { + vpc_id = "${aws_vpc.my_vpc.id}" + cidr_block = "172.16.20.0/24" + availability_zone = "us-west-2a" +} + +resource "aws_instance" "foo" { + ami = "ami-51537029" # us-west-2 + instance_type = "t3.micro" + subnet_id = "${aws_subnet.my_subnet.id}" + credit_specification { + cpu_credits = "standard" + } +} +`, rInt) +} + func testAccInstanceConfig_creditSpecification_unlimitedCpuCredits(rInt int) string { return fmt.Sprintf(` resource "aws_vpc" "my_vpc" { @@ -3335,6 +3477,32 @@ resource "aws_instance" "foo" { `, rInt) } +func testAccInstanceConfig_creditSpecification_unlimitedCpuCredits_t3(rInt int) string { + return fmt.Sprintf(` +resource "aws_vpc" "my_vpc" { + cidr_block = "172.16.0.0/16" + tags { + Name = "tf-acctest-%d" + } +} + +resource "aws_subnet" "my_subnet" { + vpc_id = "${aws_vpc.my_vpc.id}" + cidr_block = "172.16.20.0/24" + availability_zone = "us-west-2a" +} + +resource "aws_instance" "foo" { + ami = "ami-51537029" # us-west-2 + instance_type = "t3.micro" + subnet_id = "${aws_subnet.my_subnet.id}" + credit_specification { + cpu_credits = "unlimited" + } +} +`, rInt) +} + func testAccInstanceConfig_creditSpecification_isNotAppliedToNonBurstable(rInt int) string { return fmt.Sprintf(` resource "aws_vpc" "my_vpc" { From 5ad9507bfd5644fd291e065ae8a8398f9a331376 Mon Sep 17 00:00:00 2001 From: Ryan Kennedy Date: Thu, 6 Sep 2018 14:32:21 -0700 Subject: [PATCH 083/184] Updating elasticsearch resource website documentation. Fixes #5806 --- website/docs/r/elasticsearch_domain.html.markdown | 7 ++++--- website/docs/r/elasticsearch_domain_policy.html.markdown | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/website/docs/r/elasticsearch_domain.html.markdown b/website/docs/r/elasticsearch_domain.html.markdown index 3b0fedf3e97..39cd43842cd 100644 --- a/website/docs/r/elasticsearch_domain.html.markdown +++ b/website/docs/r/elasticsearch_domain.html.markdown @@ -3,7 +3,7 @@ layout: "aws" page_title: "AWS: aws_elasticsearch_domain" sidebar_current: "docs-aws-resource-elasticsearch-domain" description: |- - Provides an ElasticSearch Domain. + Provides an Elasticsearch Domain. --- # aws_elasticsearch_domain @@ -74,7 +74,7 @@ The following arguments are supported: * `snapshot_options` - (Optional) Snapshot related options, see below. * `vpc_options` - (Optional) VPC related options, see below. Adding or removing this configuration forces a new resource ([documentation](https://docs.aws.amazon.com/elasticsearch-service/latest/developerguide/es-vpc.html#es-vpc-limitations)). * `log_publishing_options` - (Optional) Options for publishing slow logs to CloudWatch Logs. -* `elasticsearch_version` - (Optional) The version of ElasticSearch to deploy. Defaults to `1.5` +* `elasticsearch_version` - (Optional) The version of Elasticsearch to deploy. Defaults to `1.5` * `tags` - (Optional) A mapping of tags to assign to the resource **ebs_options** supports the following attributes: @@ -135,6 +135,7 @@ In addition to all arguments above, the following attributes are exported: * `arn` - Amazon Resource Name (ARN) of the domain. * `domain_id` - Unique identifier for the domain. +* `domain_name` - The name of the Elasticsearch domain. * `endpoint` - Domain-specific endpoint used to submit index, search, and data upload requests. * `kibana_endpoint` - Domain-specific endpoint for kibana without https scheme. * `vpc_options.0.availability_zones` - If the domain was created inside a VPC, the names of the availability zones the configured `subnet_ids` were created inside. @@ -142,7 +143,7 @@ In addition to all arguments above, the following attributes are exported: ## Import -ElasticSearch domains can be imported using the `domain_name`, e.g. +Elasticsearch domains can be imported using the `domain_name`, e.g. ``` $ terraform import aws_elasticsearch_domain.example domain_name diff --git a/website/docs/r/elasticsearch_domain_policy.html.markdown b/website/docs/r/elasticsearch_domain_policy.html.markdown index f6b3d3041f1..08165a0b99c 100644 --- a/website/docs/r/elasticsearch_domain_policy.html.markdown +++ b/website/docs/r/elasticsearch_domain_policy.html.markdown @@ -3,12 +3,12 @@ layout: "aws" page_title: "AWS: aws_elasticsearch_domain" sidebar_current: "docs-aws-resource-elasticsearch-domain" description: |- - Provides an ElasticSearch Domain. + Provides an Elasticsearch Domain Policy. --- # aws_elasticsearch_domain_policy -Allows setting policy to an ElasticSearch domain while referencing domain attributes (e.g. ARN) +Allows setting policy to an Elasticsearch domain while referencing domain attributes (e.g. ARN) ## Example Usage From a106e1fef870436536d1c24369bb6b3694486747 Mon Sep 17 00:00:00 2001 From: Edward Wilde Date: Fri, 7 Sep 2018 21:10:01 +0100 Subject: [PATCH 084/184] Add docker volume configuration to ecs tasks Add support for docker volume configuration to ecs task definitions Resolves #5523 Signed-off-by: Edward Wilde --- aws/resource_aws_ecs_task_definition.go | 45 +++++- aws/resource_aws_ecs_task_definition_test.go | 136 ++++++++++++++++++ aws/structure.go | 60 +++++++- .../docs/r/ecs_task_definition.html.markdown | 27 ++++ 4 files changed, 266 insertions(+), 2 deletions(-) diff --git a/aws/resource_aws_ecs_task_definition.go b/aws/resource_aws_ecs_task_definition.go index fbf3a329c1e..62250a2fb46 100644 --- a/aws/resource_aws_ecs_task_definition.go +++ b/aws/resource_aws_ecs_task_definition.go @@ -108,6 +108,50 @@ func resourceAwsEcsTaskDefinition() *schema.Resource { Optional: true, ForceNew: true, }, + + "docker_volume_configuration": { + Type: schema.TypeList, + Optional: true, + ForceNew: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "scope": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ForceNew: true, + ValidateFunc: validation.StringInSlice([]string{ + ecs.ScopeShared, + ecs.ScopeTask, + }, false), + }, + "autoprovision": { + Type: schema.TypeBool, + Optional: true, + ForceNew: true, + Default: false, + }, + "driver": { + Type: schema.TypeString, + ForceNew: true, + Optional: true, + }, + "driver_opts": { + Type: schema.TypeMap, + Elem: &schema.Schema{Type: schema.TypeString}, + ForceNew: true, + Optional: true, + }, + "labels": { + Type: schema.TypeMap, + Elem: &schema.Schema{Type: schema.TypeString}, + ForceNew: true, + Optional: true, + }, + }, + }, + }, }, }, Set: resourceAwsEcsTaskDefinitionVolumeHash, @@ -324,6 +368,5 @@ func resourceAwsEcsTaskDefinitionVolumeHash(v interface{}) int { m := v.(map[string]interface{}) buf.WriteString(fmt.Sprintf("%s-", m["name"].(string))) buf.WriteString(fmt.Sprintf("%s-", m["host_path"].(string))) - return hashcode.String(buf.String()) } diff --git a/aws/resource_aws_ecs_task_definition_test.go b/aws/resource_aws_ecs_task_definition_test.go index 4dc286abad1..5beb907a8b4 100644 --- a/aws/resource_aws_ecs_task_definition_test.go +++ b/aws/resource_aws_ecs_task_definition_test.go @@ -60,6 +60,78 @@ func TestAccAWSEcsTaskDefinition_withScratchVolume(t *testing.T) { }) } +func TestAccAWSEcsTaskDefinition_withDockerVolume(t *testing.T) { + var def ecs.TaskDefinition + + rString := acctest.RandString(8) + tdName := fmt.Sprintf("tf_acc_td_with_docker_volume_%s", rString) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSEcsTaskDefinitionDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSEcsTaskDefinitionWithDockerVolumes(tdName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSEcsTaskDefinitionExists("aws_ecs_task_definition.sleep", &def), + resource.TestCheckResourceAttr( + "aws_ecs_task_definition.sleep", "volume.#", "1"), + resource.TestCheckResourceAttr( + "aws_ecs_task_definition.sleep", "volume.584193650.docker_volume_configuration.#", "1"), + resource.TestCheckResourceAttr( + "aws_ecs_task_definition.sleep", "volume.584193650.docker_volume_configuration.0.scope", "shared"), + resource.TestCheckResourceAttr( + "aws_ecs_task_definition.sleep", "volume.584193650.docker_volume_configuration.0.autoprovision", "true"), + resource.TestCheckResourceAttr( + "aws_ecs_task_definition.sleep", "volume.584193650.docker_volume_configuration.0.driver", "local"), + resource.TestCheckResourceAttr( + "aws_ecs_task_definition.sleep", "volume.584193650.docker_volume_configuration.0.driver_opts.%", "2"), + resource.TestCheckResourceAttr( + "aws_ecs_task_definition.sleep", "volume.584193650.docker_volume_configuration.0.driver_opts.uid", "1000"), + resource.TestCheckResourceAttr( + "aws_ecs_task_definition.sleep", "volume.584193650.docker_volume_configuration.0.driver_opts.device", "tmpfs"), + resource.TestCheckResourceAttr( + "aws_ecs_task_definition.sleep", "volume.584193650.docker_volume_configuration.0.labels.%", "2"), + resource.TestCheckResourceAttr( + "aws_ecs_task_definition.sleep", "volume.584193650.docker_volume_configuration.0.labels.stack", "april"), + resource.TestCheckResourceAttr( + "aws_ecs_task_definition.sleep", "volume.584193650.docker_volume_configuration.0.labels.environment", "test"), + ), + }, + }, + }) +} + +func TestAccAWSEcsTaskDefinition_withDockerVolumeMinimalConfig(t *testing.T) { + var def ecs.TaskDefinition + + rString := acctest.RandString(8) + tdName := fmt.Sprintf("tf_acc_td_with_docker_volume_%s", rString) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSEcsTaskDefinitionDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSEcsTaskDefinitionWithDockerVolumesMinimalConfig(tdName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSEcsTaskDefinitionExists("aws_ecs_task_definition.sleep", &def), + resource.TestCheckResourceAttr( + "aws_ecs_task_definition.sleep", "volume.#", "1"), + resource.TestCheckResourceAttr( + "aws_ecs_task_definition.sleep", "volume.584193650.docker_volume_configuration.#", "1"), + resource.TestCheckResourceAttr( + "aws_ecs_task_definition.sleep", "volume.584193650.docker_volume_configuration.0.scope", "task"), + resource.TestCheckResourceAttr( + "aws_ecs_task_definition.sleep", "volume.584193650.docker_volume_configuration.0.driver", "local"), + ), + }, + }, + }) +} + // Regression for https://github.com/hashicorp/terraform/issues/2694 func TestAccAWSEcsTaskDefinition_withEcsService(t *testing.T) { var def ecs.TaskDefinition @@ -766,6 +838,70 @@ TASK_DEFINITION `, tdName) } +func testAccAWSEcsTaskDefinitionWithDockerVolumes(tdName string) string { + return fmt.Sprintf(` +resource "aws_ecs_task_definition" "sleep" { + family = "%s" + container_definitions = < 0 { + config := configList[0].(map[string]interface{}) + l.DockerVolumeConfiguration = &ecs.DockerVolumeConfiguration{} + + if v, ok := config["scope"].(string); ok && v != "" { + l.DockerVolumeConfiguration.Scope = aws.String(v) + } + + if v, ok := config["autoprovision"]; ok { + l.DockerVolumeConfiguration.Autoprovision = aws.Bool(v.(bool)) + } + + if v, ok := config["driver"].(string); ok && v != "" { + l.DockerVolumeConfiguration.Driver = aws.String(v) + } + + if v, ok := config["driver_opts"].(map[string]interface{}); ok && len(v) > 0 { + l.DockerVolumeConfiguration.DriverOpts = stringMapToPointers(v) + } + + if v, ok := config["labels"].(map[string]interface{}); ok && len(v) > 0 { + l.DockerVolumeConfiguration.Labels = stringMapToPointers(v) + } + } + volumes = append(volumes, l) } @@ -621,15 +647,47 @@ func flattenEcsVolumes(list []*ecs.Volume) []map[string]interface{} { "name": *volume.Name, } - if volume.Host.SourcePath != nil { + if volume.Host != nil && volume.Host.SourcePath != nil { l["host_path"] = *volume.Host.SourcePath } + if volume.DockerVolumeConfiguration != nil { + l["docker_volume_configuration"] = flattenDockerVolumeConfiguration(volume.DockerVolumeConfiguration) + } + result = append(result, l) } return result } +func flattenDockerVolumeConfiguration(config *ecs.DockerVolumeConfiguration) []interface{} { + var items []interface{} + m := make(map[string]interface{}) + + if config.Scope != nil { + m["scope"] = aws.StringValue(config.Scope) + } + + if config.Autoprovision != nil { + m["autoprovision"] = aws.BoolValue(config.Autoprovision) + } + + if config.Driver != nil { + m["driver"] = aws.StringValue(config.Driver) + } + + if config.DriverOpts != nil { + m["driver_opts"] = pointersMapToStringList(config.DriverOpts) + } + + if config.Labels != nil { + m["labels"] = pointersMapToStringList(config.Labels) + } + + items = append(items, m) + return items +} + // Flattens an array of ECS LoadBalancers into a []map[string]interface{} func flattenEcsLoadBalancers(list []*ecs.LoadBalancer) []map[string]interface{} { result := make([]map[string]interface{}, 0, len(list)) diff --git a/website/docs/r/ecs_task_definition.html.markdown b/website/docs/r/ecs_task_definition.html.markdown index 2676d0b7f23..40fb3ec2636 100644 --- a/website/docs/r/ecs_task_definition.html.markdown +++ b/website/docs/r/ecs_task_definition.html.markdown @@ -93,6 +93,33 @@ official [Developer Guide](https://docs.aws.amazon.com/AmazonECS/latest/develope * `name` - (Required) The name of the volume. This name is referenced in the `sourceVolume` parameter of container definition in the `mountPoints` section. * `host_path` - (Optional) The path on the host container instance that is presented to the container. If not set, ECS will create a nonpersistent data volume that starts empty and is deleted after the task has finished. +* `docker_volume_configuration` - (Optional) Used to configure a [docker volume](#docker-volume-configuration-arguments) + +#### Docker Volume Configuration Arguments + +For more information, see [Specifying a Docker volume in your Task Definition Developer Guide](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/docker-volumes.html#specify-volume-config) + +* `scope` - (Optional) The scope for the Docker volume, which determines its lifecycle, either `task` or `shared`. Docker volumes that are scoped to a `task` are automatically provisioned when the task starts and destroyed when the task stops. Docker volumes that are `scoped` as shared persist after the task stops. +* `autoprovision` - (Optional) If this value is `true`, the Docker volume is created if it does not already exist. *Note*: This field is only used if the scope is `shared`. +* `driver` - (Optional) The Docker volume driver to use. The driver value must match the driver name provided by Docker because it is used for task placement. +* `driver_opts` - (Optional) A map of Docker driver specific options. +* `labels` - (Optional) A map of custom metadata to add to your Docker volume. + +##### Example Usage: +```hcl +resource "aws_ecs_task_definition" "service" { + family = "service" + container_definitions = "${file("task-definitions/service.json")}" + + volume { + name = "service-storage" + docker_volume_configuration { + scope = "shared" + autoprovision = true + } + } +} +``` #### Placement Constraints Arguments From 9a10e51c82f4f38f98e333470bee663d3262b5c2 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 7 Sep 2018 17:49:41 -0400 Subject: [PATCH 085/184] Add 'aws_dx_bgp_peer' resource. --- aws/provider.go | 3 +- aws/resource_aws_dx_bgp_peer.go | 122 +++++++++++++++++++++++ website/aws.erb | 3 + website/docs/r/dx_bgp_peer.html.markdown | 48 +++++++++ 4 files changed, 175 insertions(+), 1 deletion(-) create mode 100644 aws/resource_aws_dx_bgp_peer.go create mode 100644 website/docs/r/dx_bgp_peer.html.markdown diff --git a/aws/provider.go b/aws/provider.go index bf80ad57383..4ad68aced13 100644 --- a/aws/provider.go +++ b/aws/provider.go @@ -380,7 +380,7 @@ func Provider() terraform.ResourceProvider { "aws_dms_replication_instance": resourceAwsDmsReplicationInstance(), "aws_dms_replication_subnet_group": resourceAwsDmsReplicationSubnetGroup(), "aws_dms_replication_task": resourceAwsDmsReplicationTask(), - "aws_dx_lag": resourceAwsDxLag(), + "aws_dx_bgp_peer": resourceAwsDxBgpPeer(), "aws_dx_connection": resourceAwsDxConnection(), "aws_dx_connection_association": resourceAwsDxConnectionAssociation(), "aws_dx_gateway": resourceAwsDxGateway(), @@ -389,6 +389,7 @@ func Provider() terraform.ResourceProvider { "aws_dx_hosted_private_virtual_interface_accepter": resourceAwsDxHostedPrivateVirtualInterfaceAccepter(), "aws_dx_hosted_public_virtual_interface": resourceAwsDxHostedPublicVirtualInterface(), "aws_dx_hosted_public_virtual_interface_accepter": resourceAwsDxHostedPublicVirtualInterfaceAccepter(), + "aws_dx_lag": resourceAwsDxLag(), "aws_dx_private_virtual_interface": resourceAwsDxPrivateVirtualInterface(), "aws_dx_public_virtual_interface": resourceAwsDxPublicVirtualInterface(), "aws_dynamodb_table": resourceAwsDynamoDbTable(), diff --git a/aws/resource_aws_dx_bgp_peer.go b/aws/resource_aws_dx_bgp_peer.go new file mode 100644 index 00000000000..a3e0ec2be07 --- /dev/null +++ b/aws/resource_aws_dx_bgp_peer.go @@ -0,0 +1,122 @@ +package aws + +import ( + "fmt" + "log" + "time" + + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/directconnect" + "github.com/hashicorp/terraform/helper/schema" + "github.com/hashicorp/terraform/helper/validation" +) + +func resourceAwsDxBgpPeer() *schema.Resource { + return &schema.Resource{ + Create: resourceAwsDxBgpPeerCreate, + Read: resourceAwsDxBgpPeerRead, + Delete: resourceAwsDxBgpPeerDelete, + CustomizeDiff: resourceAwsDxBgpPeerCustomizeDiff, + + Schema: map[string]*schema.Schema{ + "address_family": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + ValidateFunc: validation.StringInSlice([]string{directconnect.AddressFamilyIpv4, directconnect.AddressFamilyIpv6}, false), + }, + "bgp_asn": { + Type: schema.TypeInt, + Required: true, + ForceNew: true, + }, + "virtual_interface_id": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + "amazon_address": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ForceNew: true, + }, + "bgp_auth_key": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ForceNew: true, + }, + "customer_address": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ForceNew: true, + }, + }, + + Timeouts: &schema.ResourceTimeout{ + Create: schema.DefaultTimeout(10 * time.Minute), + Delete: schema.DefaultTimeout(10 * time.Minute), + }, + } +} + +func resourceAwsDxBgpPeerCreate(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).dxconn + + req := &directconnect.CreateBGPPeerInput{ + VirtualInterfaceId: aws.String(d.Get("virtual_interface_id").(string)), + NewBGPPeer: &directconnect.NewBGPPeer{ + AddressFamily: aws.String(d.Get("address_family").(string)), + Asn: aws.Int64(int64(d.Get("bgp_asn").(int))), + }, + } + if v, ok := d.GetOk("amazon_address"); ok && v.(string) != "" { + req.NewBGPPeer.AmazonAddress = aws.String(v.(string)) + } + if v, ok := d.GetOk("bgp_auth_key"); ok && v.(string) != "" { + req.NewBGPPeer.AuthKey = aws.String(v.(string)) + } + if v, ok := d.GetOk("customer_address"); ok && v.(string) != "" { + req.NewBGPPeer.CustomerAddress = aws.String(v.(string)) + } + + log.Printf("[DEBUG] Creating Direct Connect BGP peer: %#v", req) + _, err := conn.CreateBGPPeer(req) + if err != nil { + return fmt.Errorf("Error creating Direct Connect BGP peer: %s", err) + } + + d.SetId(fmt.Sprintf("%s-%s-%d", d.Get("virtual_interface_id"), d.Get("address_family"), d.Get("bgp_asn"))) + + // if err := dxPublicVirtualInterfaceWaitUntilAvailable(d, conn); err != nil { + // return err + // } + + return resourceAwsDxBgpPeerRead(d, meta) +} + +func resourceAwsDxBgpPeerRead(d *schema.ResourceData, meta interface{}) error { + return nil +} + +func resourceAwsDxBgpPeerDelete(d *schema.ResourceData, meta interface{}) error { + return nil +} + +func resourceAwsDxBgpPeerCustomizeDiff(diff *schema.ResourceDiff, meta interface{}) error { + if diff.Id() == "" { + // New resource. + if addressFamily := diff.Get("address_family").(string); addressFamily == directconnect.AddressFamilyIpv4 { + if _, ok := diff.GetOk("customer_address"); !ok { + return fmt.Errorf("'customer_address' must be set when 'address_family' is '%s'", addressFamily) + } + if _, ok := diff.GetOk("amazon_address"); !ok { + return fmt.Errorf("'amazon_address' must be set when 'address_family' is '%s'", addressFamily) + } + } + } + + return nil +} diff --git a/website/aws.erb b/website/aws.erb index 30f400d20b9..ee06f55d269 100644 --- a/website/aws.erb +++ b/website/aws.erb @@ -796,6 +796,9 @@ > Direct Connect Resources
      + > + aws_dx_bgp_peer + > aws_dx_connection diff --git a/website/docs/r/dx_bgp_peer.html.markdown b/website/docs/r/dx_bgp_peer.html.markdown new file mode 100644 index 00000000000..ecb3a8576ee --- /dev/null +++ b/website/docs/r/dx_bgp_peer.html.markdown @@ -0,0 +1,48 @@ +--- +layout: "aws" +page_title: "AWS: aws_dx_bgp_peer" +sidebar_current: "docs-aws-resource-dx-bgp-peer" +description: |- + Provides a Direct Connect BGP peer resource. +--- + +# aws_dx_bgp_peer + +Provides a Direct Connect BGP peer resource. + +## Example Usage + +```hcl +resource "aws_dx_bgp_peer" "peer" { + virtual_interface_id = "${aws_dx_private_virtual_interface.foo.id}" + address_family = "ipv6" + bgp_asn = 65351 +} +``` + +## Argument Reference + +The following arguments are supported: + +* `address_family` - (Required) The address family for the BGP peer. `ipv4 ` or `ipv6`. +* `bgp_asn` - (Required) The autonomous system (AS) number for Border Gateway Protocol (BGP) configuration. +* `virtual_interface_id` - (Required) The ID of the Direct Connect virtual interface on which to create the BGP peer. +* `amazon_address` - (Optional) The IPv4 CIDR address to use to send traffic to Amazon. +Required for IPv4 BGP peers on public virtual interfaces. +* `bgp_auth_key` - (Optional) The authentication key for BGP configuration. +* `customer_address` - (Optional) The IPv4 CIDR destination address to which Amazon should send traffic. +Required for IPv4 BGP peers on public virtual interfaces. + +## Attributes Reference + +In addition to all arguments above, the following attributes are exported: + +* `id` - The ID of the BGP peer. + +## Timeouts + +`aws_dx_bgp_peer` provides the following +[Timeouts](/docs/configuration/resources.html#timeouts) configuration options: + +- `create` - (Default `10 minutes`) Used for creating BGP peer +- `delete` - (Default `10 minutes`) Used for destroying BGP peer From 5923c7204deb05c7c53ab320c6af5884b71fc94a Mon Sep 17 00:00:00 2001 From: saravanan30erd Date: Sat, 8 Sep 2018 18:42:10 +0400 Subject: [PATCH 086/184] cover the issues in acceptance test --- aws/resource_aws_iam_policy_test.go | 44 +++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/aws/resource_aws_iam_policy_test.go b/aws/resource_aws_iam_policy_test.go index a63a75eb695..15b57f62451 100644 --- a/aws/resource_aws_iam_policy_test.go +++ b/aws/resource_aws_iam_policy_test.go @@ -8,6 +8,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/iam" + "github.com/hashicorp/terraform/helper/acctest" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" ) @@ -46,6 +47,26 @@ func TestAWSPolicy_invalidJson(t *testing.T) { }) } +func TestAWSPolicy_checkDescription(t *testing.T) { + var out iam.GetPolicyOutput + rName := acctest.RandString(10) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSPolicyDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSPolicyDescriptionCheckConfig(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSPolicyExists("aws_iam_policy.policy", &out), + resource.TestCheckResourceAttrSet("aws_iam_policy.policy", "description"), + ), + }, + }, + }) +} + func testAccCheckAWSPolicyExists(resource string, res *iam.GetPolicyOutput) resource.TestCheckFunc { return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[resource] @@ -129,3 +150,26 @@ resource "aws_iam_policy" "policy" { EOF } ` + +func testAccAWSPolicyDescriptionCheckConfig(rName string) string { + return fmt.Sprintf(` + resource "aws_iam_policy" "policy" { + name_prefix = "test-policy-%s" + path = "/" + policy = < Date: Sat, 8 Sep 2018 18:50:34 +0400 Subject: [PATCH 087/184] add default value to attr description --- aws/resource_aws_iam_policy.go | 1 + 1 file changed, 1 insertion(+) diff --git a/aws/resource_aws_iam_policy.go b/aws/resource_aws_iam_policy.go index 7b208cf250e..aba97953b7e 100644 --- a/aws/resource_aws_iam_policy.go +++ b/aws/resource_aws_iam_policy.go @@ -28,6 +28,7 @@ func resourceAwsIamPolicy() *schema.Resource { Type: schema.TypeString, ForceNew: true, Optional: true, + Default: "Managed by Terraform", }, "path": { Type: schema.TypeString, From 27e6a6884a09da1c2aec02d13c1cac1810d09a21 Mon Sep 17 00:00:00 2001 From: saravanan30erd Date: Sun, 9 Sep 2018 18:44:11 +0400 Subject: [PATCH 088/184] add x-ray tracing attribute --- aws/resource_aws_api_gateway_stage.go | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/aws/resource_aws_api_gateway_stage.go b/aws/resource_aws_api_gateway_stage.go index 8ad8315a271..627f57b28dd 100644 --- a/aws/resource_aws_api_gateway_stage.go +++ b/aws/resource_aws_api_gateway_stage.go @@ -104,6 +104,10 @@ func resourceAwsApiGatewayStage() *schema.Resource { Optional: true, }, "tags": tagsSchema(), + "xray_tracing_enabled": { + Type: schema.TypeBool, + Optional: true, + }, }, } } @@ -131,6 +135,9 @@ func resourceAwsApiGatewayStageCreate(d *schema.ResourceData, meta interface{}) if v, ok := d.GetOk("description"); ok { input.Description = aws.String(v.(string)) } + if v, ok := d.GetOk("xray_tracing_enabled"); ok { + input.TracingEnabled = aws.Bool(v.(bool)) + } if v, ok := d.GetOk("documentation_version"); ok { input.DocumentationVersion = aws.String(v.(string)) } @@ -161,6 +168,7 @@ func resourceAwsApiGatewayStageCreate(d *schema.ResourceData, meta interface{}) d.SetPartial("deployment_id") d.SetPartial("description") d.SetPartial("variables") + d.SetPartial("xray_tracing_enabled") if waitForCache && *out.CacheClusterStatus != "NOT_AVAILABLE" { stateConf := &resource.StateChangeConf{ @@ -233,6 +241,7 @@ func resourceAwsApiGatewayStageRead(d *schema.ResourceData, meta interface{}) er d.Set("deployment_id", stage.DeploymentId) d.Set("description", stage.Description) d.Set("documentation_version", stage.DocumentationVersion) + d.Set("xray_tracing_enabled", stage.TracingEnabled) if err := d.Set("tags", aws.StringValueMap(stage.Tags)); err != nil { return fmt.Errorf("error setting tags: %s", err) @@ -312,6 +321,13 @@ func resourceAwsApiGatewayStageUpdate(d *schema.ResourceData, meta interface{}) Value: aws.String(d.Get("description").(string)), }) } + if d.HasChange("xray_tracing_enabled") { + operations = append(operations, &apigateway.PatchOperation{ + Op: aws.String("replace"), + Path: aws.String("/tracingEnabled"), + Value: aws.String(fmt.Sprintf("%t", d.Get("xray_tracing_enabled").(bool))), + }) + } if d.HasChange("documentation_version") { operations = append(operations, &apigateway.PatchOperation{ Op: aws.String("replace"), @@ -361,6 +377,7 @@ func resourceAwsApiGatewayStageUpdate(d *schema.ResourceData, meta interface{}) d.SetPartial("client_certificate_id") d.SetPartial("deployment_id") d.SetPartial("description") + d.SetPartial("xray_tracing_enabled") d.SetPartial("variables") if waitForCache && *out.CacheClusterStatus != "NOT_AVAILABLE" { From cba9118181c56b724b7c2acfc64bb01f0d35a361 Mon Sep 17 00:00:00 2001 From: saravanan30erd Date: Sun, 9 Sep 2018 19:06:14 +0400 Subject: [PATCH 089/184] vendor: aws/aws-sdk-go@v1.15.31 --- .../aws/aws-sdk-go/aws/endpoints/defaults.go | 30 +- .../aws/aws-sdk-go/aws/signer/v4/v4.go | 48 +- .../github.com/aws/aws-sdk-go/aws/version.go | 2 +- .../private/protocol/ec2query/unmarshal.go | 12 +- .../protocol/json/jsonutil/unmarshal.go | 13 +- .../private/protocol/jsonrpc/jsonrpc.go | 20 +- .../private/protocol/query/unmarshal.go | 6 +- .../private/protocol/query/unmarshal_error.go | 14 +- .../private/protocol/restjson/restjson.go | 14 +- .../private/protocol/restxml/restxml.go | 12 +- .../aws/aws-sdk-go/service/apigateway/api.go | 31 +- .../aws/aws-sdk-go/service/cloudfront/api.go | 4 + .../aws/aws-sdk-go/service/cloudtrail/api.go | 6 + .../aws-sdk-go/service/cloudwatchlogs/api.go | 30 +- .../aws/aws-sdk-go/service/codecommit/api.go | 100 +- .../aws-sdk-go/service/configservice/api.go | 31 +- .../service/configservice/errors.go | 8 +- .../service/databasemigrationservice/api.go | 4 + .../aws-sdk-go/service/directconnect/api.go | 24 + .../aws/aws-sdk-go/service/dynamodb/api.go | 141 +++ .../service/elastictranscoder/api.go | 20 + .../aws/aws-sdk-go/service/elb/api.go | 69 +- .../aws/aws-sdk-go/service/elb/errors.go | 3 + .../aws/aws-sdk-go/service/emr/api.go | 6 + .../aws/aws-sdk-go/service/firehose/api.go | 4 + .../aws/aws-sdk-go/service/iot/api.go | 26 + .../aws/aws-sdk-go/service/lambda/api.go | 9 + .../aws/aws-sdk-go/service/lightsail/api.go | 10 + .../aws-sdk-go/service/mediaconvert/api.go | 132 +- .../aws-sdk-go/service/mediapackage/api.go | 8 + .../aws/aws-sdk-go/service/neptune/api.go | 6 + .../aws/aws-sdk-go/service/rds/api.go | 376 +++--- .../aws/aws-sdk-go/service/s3/api.go | 55 + vendor/vendor.json | 1076 ++++++++--------- 34 files changed, 1530 insertions(+), 820 deletions(-) diff --git a/vendor/github.com/aws/aws-sdk-go/aws/endpoints/defaults.go b/vendor/github.com/aws/aws-sdk-go/aws/endpoints/defaults.go index 86788100adc..47952a80ba8 100644 --- a/vendor/github.com/aws/aws-sdk-go/aws/endpoints/defaults.go +++ b/vendor/github.com/aws/aws-sdk-go/aws/endpoints/defaults.go @@ -2004,9 +2004,33 @@ var awsPartition = partition{ "eu-west-2": endpoint{}, "sa-east-1": endpoint{}, "us-east-1": endpoint{}, - "us-east-2": endpoint{}, - "us-west-1": endpoint{}, - "us-west-2": endpoint{}, + "us-east-1-fips": endpoint{ + Hostname: "secretsmanager-fips.us-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-1", + }, + }, + "us-east-2": endpoint{}, + "us-east-2-fips": endpoint{ + Hostname: "secretsmanager-fips.us-east-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-2", + }, + }, + "us-west-1": endpoint{}, + "us-west-1-fips": endpoint{ + Hostname: "secretsmanager-fips.us-west-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-1", + }, + }, + "us-west-2": endpoint{}, + "us-west-2-fips": endpoint{ + Hostname: "secretsmanager-fips.us-west-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-2", + }, + }, }, }, "serverlessrepo": service{ diff --git a/vendor/github.com/aws/aws-sdk-go/aws/signer/v4/v4.go b/vendor/github.com/aws/aws-sdk-go/aws/signer/v4/v4.go index 8aa0681d340..5b52ab2215f 100644 --- a/vendor/github.com/aws/aws-sdk-go/aws/signer/v4/v4.go +++ b/vendor/github.com/aws/aws-sdk-go/aws/signer/v4/v4.go @@ -98,25 +98,25 @@ var ignoredHeaders = rules{ var requiredSignedHeaders = rules{ whitelist{ mapRule{ - "Cache-Control": struct{}{}, - "Content-Disposition": struct{}{}, - "Content-Encoding": struct{}{}, - "Content-Language": struct{}{}, - "Content-Md5": struct{}{}, - "Content-Type": struct{}{}, - "Expires": struct{}{}, - "If-Match": struct{}{}, - "If-Modified-Since": struct{}{}, - "If-None-Match": struct{}{}, - "If-Unmodified-Since": struct{}{}, - "Range": struct{}{}, - "X-Amz-Acl": struct{}{}, - "X-Amz-Copy-Source": struct{}{}, - "X-Amz-Copy-Source-If-Match": struct{}{}, - "X-Amz-Copy-Source-If-Modified-Since": struct{}{}, - "X-Amz-Copy-Source-If-None-Match": struct{}{}, - "X-Amz-Copy-Source-If-Unmodified-Since": struct{}{}, - "X-Amz-Copy-Source-Range": struct{}{}, + "Cache-Control": struct{}{}, + "Content-Disposition": struct{}{}, + "Content-Encoding": struct{}{}, + "Content-Language": struct{}{}, + "Content-Md5": struct{}{}, + "Content-Type": struct{}{}, + "Expires": struct{}{}, + "If-Match": struct{}{}, + "If-Modified-Since": struct{}{}, + "If-None-Match": struct{}{}, + "If-Unmodified-Since": struct{}{}, + "Range": struct{}{}, + "X-Amz-Acl": struct{}{}, + "X-Amz-Copy-Source": struct{}{}, + "X-Amz-Copy-Source-If-Match": struct{}{}, + "X-Amz-Copy-Source-If-Modified-Since": struct{}{}, + "X-Amz-Copy-Source-If-None-Match": struct{}{}, + "X-Amz-Copy-Source-If-Unmodified-Since": struct{}{}, + "X-Amz-Copy-Source-Range": struct{}{}, "X-Amz-Copy-Source-Server-Side-Encryption-Customer-Algorithm": struct{}{}, "X-Amz-Copy-Source-Server-Side-Encryption-Customer-Key": struct{}{}, "X-Amz-Copy-Source-Server-Side-Encryption-Customer-Key-Md5": struct{}{}, @@ -739,7 +739,15 @@ func makeSha256Reader(reader io.ReadSeeker) []byte { start, _ := reader.Seek(0, sdkio.SeekCurrent) defer reader.Seek(start, sdkio.SeekStart) - io.Copy(hash, reader) + // Use CopyN to avoid allocating the 32KB buffer in io.Copy for bodies + // smaller than 32KB. Fall back to io.Copy if we fail to determine the size. + size, err := aws.SeekerLen(reader) + if err != nil { + io.Copy(hash, reader) + } else { + io.CopyN(hash, reader, size) + } + return hash.Sum(nil) } diff --git a/vendor/github.com/aws/aws-sdk-go/aws/version.go b/vendor/github.com/aws/aws-sdk-go/aws/version.go index 844aa4d26f0..56436f8c8f7 100644 --- a/vendor/github.com/aws/aws-sdk-go/aws/version.go +++ b/vendor/github.com/aws/aws-sdk-go/aws/version.go @@ -5,4 +5,4 @@ package aws const SDKName = "aws-sdk-go" // SDKVersion is the version of this SDK -const SDKVersion = "1.15.26" +const SDKVersion = "1.15.31" diff --git a/vendor/github.com/aws/aws-sdk-go/private/protocol/ec2query/unmarshal.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/ec2query/unmarshal.go index 095e97ccf91..5793c047373 100644 --- a/vendor/github.com/aws/aws-sdk-go/private/protocol/ec2query/unmarshal.go +++ b/vendor/github.com/aws/aws-sdk-go/private/protocol/ec2query/unmarshal.go @@ -27,7 +27,11 @@ func Unmarshal(r *request.Request) { decoder := xml.NewDecoder(r.HTTPResponse.Body) err := xmlutil.UnmarshalXML(r.Data, decoder, "") if err != nil { - r.Error = awserr.New("SerializationError", "failed decoding EC2 Query response", err) + r.Error = awserr.NewRequestFailure( + awserr.New("SerializationError", "failed decoding EC2 Query response", err), + r.HTTPResponse.StatusCode, + r.RequestID, + ) return } } @@ -52,7 +56,11 @@ func UnmarshalError(r *request.Request) { resp := &xmlErrorResponse{} err := xml.NewDecoder(r.HTTPResponse.Body).Decode(resp) if err != nil && err != io.EOF { - r.Error = awserr.New("SerializationError", "failed decoding EC2 Query error response", err) + r.Error = awserr.NewRequestFailure( + awserr.New("SerializationError", "failed decoding EC2 Query error response", err), + r.HTTPResponse.StatusCode, + r.RequestID, + ) } else { r.Error = awserr.NewRequestFailure( awserr.New(resp.Code, resp.Message, nil), diff --git a/vendor/github.com/aws/aws-sdk-go/private/protocol/json/jsonutil/unmarshal.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/json/jsonutil/unmarshal.go index 2f6628d4364..b11f3ee45b5 100644 --- a/vendor/github.com/aws/aws-sdk-go/private/protocol/json/jsonutil/unmarshal.go +++ b/vendor/github.com/aws/aws-sdk-go/private/protocol/json/jsonutil/unmarshal.go @@ -5,7 +5,6 @@ import ( "encoding/json" "fmt" "io" - "io/ioutil" "reflect" "time" @@ -17,16 +16,10 @@ import ( func UnmarshalJSON(v interface{}, stream io.Reader) error { var out interface{} - b, err := ioutil.ReadAll(stream) - if err != nil { - return err - } - - if len(b) == 0 { + err := json.NewDecoder(stream).Decode(&out) + if err == io.EOF { return nil - } - - if err := json.Unmarshal(b, &out); err != nil { + } else if err != nil { return err } diff --git a/vendor/github.com/aws/aws-sdk-go/private/protocol/jsonrpc/jsonrpc.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/jsonrpc/jsonrpc.go index 56af4dc4426..95155f6c1b6 100644 --- a/vendor/github.com/aws/aws-sdk-go/private/protocol/jsonrpc/jsonrpc.go +++ b/vendor/github.com/aws/aws-sdk-go/private/protocol/jsonrpc/jsonrpc.go @@ -64,7 +64,11 @@ func Unmarshal(req *request.Request) { if req.DataFilled() { err := jsonutil.UnmarshalJSON(req.Data, req.HTTPResponse.Body) if err != nil { - req.Error = awserr.New("SerializationError", "failed decoding JSON RPC response", err) + req.Error = awserr.NewRequestFailure( + awserr.New("SerializationError", "failed decoding JSON RPC response", err), + req.HTTPResponse.StatusCode, + req.RequestID, + ) } } return @@ -80,20 +84,28 @@ func UnmarshalError(req *request.Request) { defer req.HTTPResponse.Body.Close() bodyBytes, err := ioutil.ReadAll(req.HTTPResponse.Body) if err != nil { - req.Error = awserr.New("SerializationError", "failed reading JSON RPC error response", err) + req.Error = awserr.NewRequestFailure( + awserr.New("SerializationError", "failed reading JSON RPC error response", err), + req.HTTPResponse.StatusCode, + req.RequestID, + ) return } if len(bodyBytes) == 0 { req.Error = awserr.NewRequestFailure( awserr.New("SerializationError", req.HTTPResponse.Status, nil), req.HTTPResponse.StatusCode, - "", + req.RequestID, ) return } var jsonErr jsonErrorResponse if err := json.Unmarshal(bodyBytes, &jsonErr); err != nil { - req.Error = awserr.New("SerializationError", "failed decoding JSON RPC error response", err) + req.Error = awserr.NewRequestFailure( + awserr.New("SerializationError", "failed decoding JSON RPC error response", err), + req.HTTPResponse.StatusCode, + req.RequestID, + ) return } diff --git a/vendor/github.com/aws/aws-sdk-go/private/protocol/query/unmarshal.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/query/unmarshal.go index e0f4d5a5419..3495c73070b 100644 --- a/vendor/github.com/aws/aws-sdk-go/private/protocol/query/unmarshal.go +++ b/vendor/github.com/aws/aws-sdk-go/private/protocol/query/unmarshal.go @@ -23,7 +23,11 @@ func Unmarshal(r *request.Request) { decoder := xml.NewDecoder(r.HTTPResponse.Body) err := xmlutil.UnmarshalXML(r.Data, decoder, r.Operation.Name+"Result") if err != nil { - r.Error = awserr.New("SerializationError", "failed decoding Query response", err) + r.Error = awserr.NewRequestFailure( + awserr.New("SerializationError", "failed decoding Query response", err), + r.HTTPResponse.StatusCode, + r.RequestID, + ) return } } diff --git a/vendor/github.com/aws/aws-sdk-go/private/protocol/query/unmarshal_error.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/query/unmarshal_error.go index f2142961717..46d354e826f 100644 --- a/vendor/github.com/aws/aws-sdk-go/private/protocol/query/unmarshal_error.go +++ b/vendor/github.com/aws/aws-sdk-go/private/protocol/query/unmarshal_error.go @@ -28,7 +28,11 @@ func UnmarshalError(r *request.Request) { bodyBytes, err := ioutil.ReadAll(r.HTTPResponse.Body) if err != nil { - r.Error = awserr.New("SerializationError", "failed to read from query HTTP response body", err) + r.Error = awserr.NewRequestFailure( + awserr.New("SerializationError", "failed to read from query HTTP response body", err), + r.HTTPResponse.StatusCode, + r.RequestID, + ) return } @@ -61,6 +65,10 @@ func UnmarshalError(r *request.Request) { } // Failed to retrieve any error message from the response body - r.Error = awserr.New("SerializationError", - "failed to decode query XML error response", decodeErr) + r.Error = awserr.NewRequestFailure( + awserr.New("SerializationError", + "failed to decode query XML error response", decodeErr), + r.HTTPResponse.StatusCode, + r.RequestID, + ) } diff --git a/vendor/github.com/aws/aws-sdk-go/private/protocol/restjson/restjson.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/restjson/restjson.go index b1d5294ad93..d61044e2c67 100644 --- a/vendor/github.com/aws/aws-sdk-go/private/protocol/restjson/restjson.go +++ b/vendor/github.com/aws/aws-sdk-go/private/protocol/restjson/restjson.go @@ -57,20 +57,28 @@ func UnmarshalError(r *request.Request) { code := r.HTTPResponse.Header.Get("X-Amzn-Errortype") bodyBytes, err := ioutil.ReadAll(r.HTTPResponse.Body) if err != nil { - r.Error = awserr.New("SerializationError", "failed reading REST JSON error response", err) + r.Error = awserr.NewRequestFailure( + awserr.New("SerializationError", "failed reading REST JSON error response", err), + r.HTTPResponse.StatusCode, + r.RequestID, + ) return } if len(bodyBytes) == 0 { r.Error = awserr.NewRequestFailure( awserr.New("SerializationError", r.HTTPResponse.Status, nil), r.HTTPResponse.StatusCode, - "", + r.RequestID, ) return } var jsonErr jsonErrorResponse if err := json.Unmarshal(bodyBytes, &jsonErr); err != nil { - r.Error = awserr.New("SerializationError", "failed decoding REST JSON error response", err) + r.Error = awserr.NewRequestFailure( + awserr.New("SerializationError", "failed decoding REST JSON error response", err), + r.HTTPResponse.StatusCode, + r.RequestID, + ) return } diff --git a/vendor/github.com/aws/aws-sdk-go/private/protocol/restxml/restxml.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/restxml/restxml.go index 7bdf4c8538f..b0f4e245661 100644 --- a/vendor/github.com/aws/aws-sdk-go/private/protocol/restxml/restxml.go +++ b/vendor/github.com/aws/aws-sdk-go/private/protocol/restxml/restxml.go @@ -36,7 +36,11 @@ func Build(r *request.Request) { var buf bytes.Buffer err := xmlutil.BuildXML(r.Params, xml.NewEncoder(&buf)) if err != nil { - r.Error = awserr.New("SerializationError", "failed to encode rest XML request", err) + r.Error = awserr.NewRequestFailure( + awserr.New("SerializationError", "failed to encode rest XML request", err), + r.HTTPResponse.StatusCode, + r.RequestID, + ) return } r.SetBufferBody(buf.Bytes()) @@ -50,7 +54,11 @@ func Unmarshal(r *request.Request) { decoder := xml.NewDecoder(r.HTTPResponse.Body) err := xmlutil.UnmarshalXML(r.Data, decoder, "") if err != nil { - r.Error = awserr.New("SerializationError", "failed to decode REST XML response", err) + r.Error = awserr.NewRequestFailure( + awserr.New("SerializationError", "failed to decode REST XML response", err), + r.HTTPResponse.StatusCode, + r.RequestID, + ) return } } else { diff --git a/vendor/github.com/aws/aws-sdk-go/service/apigateway/api.go b/vendor/github.com/aws/aws-sdk-go/service/apigateway/api.go index 4d6ae02d39d..ab6d17b6399 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/apigateway/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/apigateway/api.go @@ -12269,6 +12269,9 @@ type CreateDeploymentInput struct { // The name of the Stage resource for the Deployment resource to create. StageName *string `locationName:"stageName" type:"string"` + // Specifies whether active tracing with X-ray is enabled for the Stage. + TracingEnabled *bool `locationName:"tracingEnabled" type:"boolean"` + // A map that defines the stage variables for the Stage resource that is associated // with the new deployment. Variable names can have alphanumeric and underscore // characters, and the values must match [A-Za-z0-9-._~:/?#&=,]+. @@ -12340,6 +12343,12 @@ func (s *CreateDeploymentInput) SetStageName(v string) *CreateDeploymentInput { return s } +// SetTracingEnabled sets the TracingEnabled field's value. +func (s *CreateDeploymentInput) SetTracingEnabled(v bool) *CreateDeploymentInput { + s.TracingEnabled = &v + return s +} + // SetVariables sets the Variables field's value. func (s *CreateDeploymentInput) SetVariables(v map[string]*string) *CreateDeploymentInput { s.Variables = v @@ -13000,6 +13009,9 @@ type CreateStageInput struct { // tag value can be up to 256 characters. Tags map[string]*string `locationName:"tags" type:"map"` + // Specifies whether active tracing with X-ray is enabled for the Stage. + TracingEnabled *bool `locationName:"tracingEnabled" type:"boolean"` + // A map that defines the stage variables for the new Stage resource. Variable // names can have alphanumeric and underscore characters, and the values must // match [A-Za-z0-9-._~:/?#&=,]+. @@ -13089,6 +13101,12 @@ func (s *CreateStageInput) SetTags(v map[string]*string) *CreateStageInput { return s } +// SetTracingEnabled sets the TracingEnabled field's value. +func (s *CreateStageInput) SetTracingEnabled(v bool) *CreateStageInput { + s.TracingEnabled = &v + return s +} + // SetVariables sets the Variables field's value. func (s *CreateStageInput) SetVariables(v map[string]*string) *CreateStageInput { s.Variables = v @@ -19932,12 +19950,12 @@ type MethodSetting struct { // the value is a Boolean. CachingEnabled *bool `locationName:"cachingEnabled" type:"boolean"` - // Specifies whether data trace logging is enabled for this method, which effects + // Specifies whether data trace logging is enabled for this method, which affects // the log entries pushed to Amazon CloudWatch Logs. The PATCH path for this // setting is /{method_setting_key}/logging/dataTrace, and the value is a Boolean. DataTraceEnabled *bool `locationName:"dataTraceEnabled" type:"boolean"` - // Specifies the logging level for this method, which effects the log entries + // Specifies the logging level for this method, which affects the log entries // pushed to Amazon CloudWatch Logs. The PATCH path for this setting is /{method_setting_key}/logging/loglevel, // and the available levels are OFF, ERROR, and INFO. LoggingLevel *string `locationName:"loggingLevel" type:"string"` @@ -21528,6 +21546,9 @@ type Stage struct { // The collection of tags. Each tag element is associated with a given resource. Tags map[string]*string `locationName:"tags" type:"map"` + // Specifies whether active tracing with X-ray is enabled for the Stage. + TracingEnabled *bool `locationName:"tracingEnabled" type:"boolean"` + // A map that defines the stage variables for a Stage resource. Variable names // can have alphanumeric and underscore characters, and the values must match // [A-Za-z0-9-._~:/?#&=,]+. @@ -21628,6 +21649,12 @@ func (s *Stage) SetTags(v map[string]*string) *Stage { return s } +// SetTracingEnabled sets the TracingEnabled field's value. +func (s *Stage) SetTracingEnabled(v bool) *Stage { + s.TracingEnabled = &v + return s +} + // SetVariables sets the Variables field's value. func (s *Stage) SetVariables(v map[string]*string) *Stage { s.Variables = v diff --git a/vendor/github.com/aws/aws-sdk-go/service/cloudfront/api.go b/vendor/github.com/aws/aws-sdk-go/service/cloudfront/api.go index 77a95df64f9..f81df398430 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/cloudfront/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/cloudfront/api.go @@ -14649,6 +14649,8 @@ type ViewerCertificate struct { // * ViewerCertificate$IAMCertificateId // // * ViewerCertificate$CloudFrontDefaultCertificate + // + // Deprecated: Certificate has been deprecated Certificate *string `deprecated:"true" type:"string"` // This field has been deprecated. Use one of the following fields instead: @@ -14658,6 +14660,8 @@ type ViewerCertificate struct { // * ViewerCertificate$IAMCertificateId // // * ViewerCertificate$CloudFrontDefaultCertificate + // + // Deprecated: CertificateSource has been deprecated CertificateSource *string `deprecated:"true" type:"string" enum:"CertificateSource"` // For information about how and when to use CloudFrontDefaultCertificate, see diff --git a/vendor/github.com/aws/aws-sdk-go/service/cloudtrail/api.go b/vendor/github.com/aws/aws-sdk-go/service/cloudtrail/api.go index 2707209070f..db7a6d2ebee 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/cloudtrail/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/cloudtrail/api.go @@ -1993,6 +1993,8 @@ type CreateTrailOutput struct { SnsTopicARN *string `type:"string"` // This field is deprecated. Use SnsTopicARN. + // + // Deprecated: SnsTopicName has been deprecated SnsTopicName *string `deprecated:"true" type:"string"` // Specifies the ARN of the trail that was created. The format of a trail ARN @@ -3624,6 +3626,8 @@ type Trail struct { SnsTopicARN *string `type:"string"` // This field is deprecated. Use SnsTopicARN. + // + // Deprecated: SnsTopicName has been deprecated SnsTopicName *string `deprecated:"true" type:"string"` // Specifies the ARN of the trail. The format of a trail ARN is: @@ -3946,6 +3950,8 @@ type UpdateTrailOutput struct { SnsTopicARN *string `type:"string"` // This field is deprecated. Use SnsTopicARN. + // + // Deprecated: SnsTopicName has been deprecated SnsTopicName *string `deprecated:"true" type:"string"` // Specifies the ARN of the trail that was updated. The format of a trail ARN diff --git a/vendor/github.com/aws/aws-sdk-go/service/cloudwatchlogs/api.go b/vendor/github.com/aws/aws-sdk-go/service/cloudwatchlogs/api.go index ffca87a4986..d93b9c41888 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/cloudwatchlogs/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/cloudwatchlogs/api.go @@ -5388,7 +5388,10 @@ type FilterLogEventsInput struct { // not returned. EndTime *int64 `locationName:"endTime" type:"long"` - // The filter pattern to use. If not provided, all the events are matched. + // The filter pattern to use. For more information, see Filter and Pattern Syntax + // (http://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/FilterAndPatternSyntax.html). + // + // If not provided, all the events are matched. FilterPattern *string `locationName:"filterPattern" type:"string"` // If the value is true, the operation makes a best effort to provide responses @@ -5401,12 +5404,24 @@ type FilterLogEventsInput struct { // The maximum number of events to return. The default is 10,000 events. Limit *int64 `locationName:"limit" min:"1" type:"integer"` - // The name of the log group. + // The name of the log group to search. // // LogGroupName is a required field LogGroupName *string `locationName:"logGroupName" min:"1" type:"string" required:"true"` - // Optional list of log stream names. + // Filters the results to include only events from log streams that have names + // starting with this prefix. + // + // If you specify a value for both logStreamNamePrefix and logStreamNames, but + // the value for logStreamNamePrefix does not match any log stream names specified + // in logStreamNames, the action returns an InvalidParameterException error. + LogStreamNamePrefix *string `locationName:"logStreamNamePrefix" min:"1" type:"string"` + + // Filters the results to only logs from the log streams in this list. + // + // If you specify a value for both logStreamNamePrefix and logStreamNames, but + // the value for logStreamNamePrefix does not match any log stream names specified + // in logStreamNames, the action returns an InvalidParameterException error. LogStreamNames []*string `locationName:"logStreamNames" min:"1" type:"list"` // The token for the next set of events to return. (You received this token @@ -5441,6 +5456,9 @@ func (s *FilterLogEventsInput) Validate() error { if s.LogGroupName != nil && len(*s.LogGroupName) < 1 { invalidParams.Add(request.NewErrParamMinLen("LogGroupName", 1)) } + if s.LogStreamNamePrefix != nil && len(*s.LogStreamNamePrefix) < 1 { + invalidParams.Add(request.NewErrParamMinLen("LogStreamNamePrefix", 1)) + } if s.LogStreamNames != nil && len(s.LogStreamNames) < 1 { invalidParams.Add(request.NewErrParamMinLen("LogStreamNames", 1)) } @@ -5484,6 +5502,12 @@ func (s *FilterLogEventsInput) SetLogGroupName(v string) *FilterLogEventsInput { return s } +// SetLogStreamNamePrefix sets the LogStreamNamePrefix field's value. +func (s *FilterLogEventsInput) SetLogStreamNamePrefix(v string) *FilterLogEventsInput { + s.LogStreamNamePrefix = &v + return s +} + // SetLogStreamNames sets the LogStreamNames field's value. func (s *FilterLogEventsInput) SetLogStreamNames(v []*string) *FilterLogEventsInput { s.LogStreamNames = v diff --git a/vendor/github.com/aws/aws-sdk-go/service/codecommit/api.go b/vendor/github.com/aws/aws-sdk-go/service/codecommit/api.go index b52c0773214..fbddd18d670 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/codecommit/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/codecommit/api.go @@ -3583,7 +3583,8 @@ func (c *CodeCommit) PutFileRequest(input *PutFileInput) (req *request.Request, // PutFile API operation for AWS CodeCommit. // -// Adds or updates a file in an AWS CodeCommit repository. +// Adds or updates a file in a branch in an AWS CodeCommit repository, and generates +// a commit for the addition in the specified branch. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about @@ -8002,6 +8003,60 @@ func (s *PullRequest) SetTitle(v string) *PullRequest { return s } +// Metadata about the pull request that is used when comparing the pull request +// source with its destination. +type PullRequestCreatedEventMetadata struct { + _ struct{} `type:"structure"` + + // The commit ID of the tip of the branch specified as the destination branch + // when the pull request was created. + DestinationCommitId *string `locationName:"destinationCommitId" type:"string"` + + // The commit ID of the most recent commit that the source branch and the destination + // branch have in common. + MergeBase *string `locationName:"mergeBase" type:"string"` + + // The name of the repository where the pull request was created. + RepositoryName *string `locationName:"repositoryName" min:"1" type:"string"` + + // The commit ID on the source branch used when the pull request was created. + SourceCommitId *string `locationName:"sourceCommitId" type:"string"` +} + +// String returns the string representation +func (s PullRequestCreatedEventMetadata) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s PullRequestCreatedEventMetadata) GoString() string { + return s.String() +} + +// SetDestinationCommitId sets the DestinationCommitId field's value. +func (s *PullRequestCreatedEventMetadata) SetDestinationCommitId(v string) *PullRequestCreatedEventMetadata { + s.DestinationCommitId = &v + return s +} + +// SetMergeBase sets the MergeBase field's value. +func (s *PullRequestCreatedEventMetadata) SetMergeBase(v string) *PullRequestCreatedEventMetadata { + s.MergeBase = &v + return s +} + +// SetRepositoryName sets the RepositoryName field's value. +func (s *PullRequestCreatedEventMetadata) SetRepositoryName(v string) *PullRequestCreatedEventMetadata { + s.RepositoryName = &v + return s +} + +// SetSourceCommitId sets the SourceCommitId field's value. +func (s *PullRequestCreatedEventMetadata) SetSourceCommitId(v string) *PullRequestCreatedEventMetadata { + s.SourceCommitId = &v + return s +} + // Returns information about a pull request event. type PullRequestEvent struct { _ struct{} `type:"structure"` @@ -8014,6 +8069,9 @@ type PullRequestEvent struct { // The day and time of the pull request event, in timestamp format. EventDate *time.Time `locationName:"eventDate" type:"timestamp"` + // Information about the source and destination branches for the pull request. + PullRequestCreatedEventMetadata *PullRequestCreatedEventMetadata `locationName:"pullRequestCreatedEventMetadata" type:"structure"` + // The type of the pull request event, for example a status change event (PULL_REQUEST_STATUS_CHANGED) // or update event (PULL_REQUEST_SOURCE_REFERENCE_UPDATED). PullRequestEventType *string `locationName:"pullRequestEventType" type:"string" enum:"PullRequestEventType"` @@ -8053,6 +8111,12 @@ func (s *PullRequestEvent) SetEventDate(v time.Time) *PullRequestEvent { return s } +// SetPullRequestCreatedEventMetadata sets the PullRequestCreatedEventMetadata field's value. +func (s *PullRequestEvent) SetPullRequestCreatedEventMetadata(v *PullRequestCreatedEventMetadata) *PullRequestEvent { + s.PullRequestCreatedEventMetadata = v + return s +} + // SetPullRequestEventType sets the PullRequestEventType field's value. func (s *PullRequestEvent) SetPullRequestEventType(v string) *PullRequestEvent { s.PullRequestEventType = &v @@ -8138,6 +8202,10 @@ type PullRequestSourceReferenceUpdatedEventMetadata struct { // of the branch at the time the pull request was updated. BeforeCommitId *string `locationName:"beforeCommitId" type:"string"` + // The commit ID of the most recent commit that the source branch and the destination + // branch have in common. + MergeBase *string `locationName:"mergeBase" type:"string"` + // The name of the repository where the pull request was updated. RepositoryName *string `locationName:"repositoryName" min:"1" type:"string"` } @@ -8164,6 +8232,12 @@ func (s *PullRequestSourceReferenceUpdatedEventMetadata) SetBeforeCommitId(v str return s } +// SetMergeBase sets the MergeBase field's value. +func (s *PullRequestSourceReferenceUpdatedEventMetadata) SetMergeBase(v string) *PullRequestSourceReferenceUpdatedEventMetadata { + s.MergeBase = &v + return s +} + // SetRepositoryName sets the RepositoryName field's value. func (s *PullRequestSourceReferenceUpdatedEventMetadata) SetRepositoryName(v string) *PullRequestSourceReferenceUpdatedEventMetadata { s.RepositoryName = &v @@ -8206,6 +8280,10 @@ type PullRequestTarget struct { // into. Also known as the destination branch. DestinationReference *string `locationName:"destinationReference" type:"string"` + // The commit ID of the most recent commit that the source branch and the destination + // branch have in common. + MergeBase *string `locationName:"mergeBase" type:"string"` + // Returns metadata about the state of the merge, including whether the merge // has been made. MergeMetadata *MergeMetadata `locationName:"mergeMetadata" type:"structure"` @@ -8246,6 +8324,12 @@ func (s *PullRequestTarget) SetDestinationReference(v string) *PullRequestTarget return s } +// SetMergeBase sets the MergeBase field's value. +func (s *PullRequestTarget) SetMergeBase(v string) *PullRequestTarget { + s.MergeBase = &v + return s +} + // SetMergeMetadata sets the MergeMetadata field's value. func (s *PullRequestTarget) SetMergeMetadata(v *MergeMetadata) *PullRequestTarget { s.MergeMetadata = v @@ -8273,7 +8357,8 @@ func (s *PullRequestTarget) SetSourceReference(v string) *PullRequestTarget { type PutFileInput struct { _ struct{} `type:"structure"` - // The name of the branch where you want to add or update the file. + // The name of the branch where you want to add or update the file. If this + // is an empty repository, this branch will be created. // // BranchName is a required field BranchName *string `locationName:"branchName" min:"1" type:"string" required:"true"` @@ -8312,9 +8397,11 @@ type PutFileInput struct { Name *string `locationName:"name" type:"string"` // The full commit ID of the head commit in the branch where you want to add - // or update the file. If the commit ID does not match the ID of the head commit - // at the time of the operation, an error will occur, and the file will not - // be added or updated. + // or update the file. If this is an empty repository, no commit ID is required. + // If this is not an empty repository, a commit ID is required. + // + // The commit ID must match the ID of the head commit at the time of the operation, + // or an error will occur, and the file will not be added or updated. ParentCommitId *string `locationName:"parentCommitId" type:"string"` // The name of the repository where you want to add or update the file. @@ -8428,7 +8515,8 @@ type PutFileOutput struct { // CommitId is a required field CommitId *string `locationName:"commitId" type:"string" required:"true"` - // Tree information for the commit that contains this file change. + // The full SHA-1 pointer of the tree information for the commit that contains + // this file change. // // TreeId is a required field TreeId *string `locationName:"treeId" type:"string" required:"true"` diff --git a/vendor/github.com/aws/aws-sdk-go/service/configservice/api.go b/vendor/github.com/aws/aws-sdk-go/service/configservice/api.go index b8bdc96412f..c77fdfb82b6 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/configservice/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/configservice/api.go @@ -3355,8 +3355,12 @@ func (c *ConfigService) PutConfigurationAggregatorRequest(input *PutConfiguratio // are valid and try again. // // * ErrCodeLimitExceededException "LimitExceededException" -// This exception is thrown if an evaluation is in progress or if you call the -// StartConfigRulesEvaluation API more than once per minute. +// For StartConfigRulesEvaluation API, this exception is thrown if an evaluation +// is in progress or if you call the StartConfigRulesEvaluation API more than +// once per minute. +// +// For PutConfigurationAggregator API, this exception is thrown if the number +// of accounts and aggregators exceeds the limit. // // * ErrCodeInvalidRoleException "InvalidRoleException" // You have provided a null or empty role ARN. @@ -3875,8 +3879,12 @@ func (c *ConfigService) StartConfigRulesEvaluationRequest(input *StartConfigRule // rule names are correct and try again. // // * ErrCodeLimitExceededException "LimitExceededException" -// This exception is thrown if an evaluation is in progress or if you call the -// StartConfigRulesEvaluation API more than once per minute. +// For StartConfigRulesEvaluation API, this exception is thrown if an evaluation +// is in progress or if you call the StartConfigRulesEvaluation API more than +// once per minute. +// +// For PutConfigurationAggregator API, this exception is thrown if the number +// of accounts and aggregators exceeds the limit. // // * ErrCodeResourceInUseException "ResourceInUseException" // The rule is currently being deleted or the rule is deleting your evaluation @@ -5045,6 +5053,12 @@ type ConfigRule struct { // available. ConfigRuleState *string `type:"string" enum:"ConfigRuleState"` + // Service principal name of the service that created the rule. + // + // The field is populated only if the service linked rule is created by a service. + // The field is empty if you create your own rule. + CreatedBy *string `min:"1" type:"string"` + // The description that you provide for the AWS Config rule. Description *string `type:"string"` @@ -5095,6 +5109,9 @@ func (s *ConfigRule) Validate() error { if s.ConfigRuleName != nil && len(*s.ConfigRuleName) < 1 { invalidParams.Add(request.NewErrParamMinLen("ConfigRuleName", 1)) } + if s.CreatedBy != nil && len(*s.CreatedBy) < 1 { + invalidParams.Add(request.NewErrParamMinLen("CreatedBy", 1)) + } if s.InputParameters != nil && len(*s.InputParameters) < 1 { invalidParams.Add(request.NewErrParamMinLen("InputParameters", 1)) } @@ -5142,6 +5159,12 @@ func (s *ConfigRule) SetConfigRuleState(v string) *ConfigRule { return s } +// SetCreatedBy sets the CreatedBy field's value. +func (s *ConfigRule) SetCreatedBy(v string) *ConfigRule { + s.CreatedBy = &v + return s +} + // SetDescription sets the Description field's value. func (s *ConfigRule) SetDescription(v string) *ConfigRule { s.Description = &v diff --git a/vendor/github.com/aws/aws-sdk-go/service/configservice/errors.go b/vendor/github.com/aws/aws-sdk-go/service/configservice/errors.go index b57a5cec4b0..02ce16d3a4a 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/configservice/errors.go +++ b/vendor/github.com/aws/aws-sdk-go/service/configservice/errors.go @@ -102,8 +102,12 @@ const ( // ErrCodeLimitExceededException for service response error code // "LimitExceededException". // - // This exception is thrown if an evaluation is in progress or if you call the - // StartConfigRulesEvaluation API more than once per minute. + // For StartConfigRulesEvaluation API, this exception is thrown if an evaluation + // is in progress or if you call the StartConfigRulesEvaluation API more than + // once per minute. + // + // For PutConfigurationAggregator API, this exception is thrown if the number + // of accounts and aggregators exceeds the limit. ErrCodeLimitExceededException = "LimitExceededException" // ErrCodeMaxNumberOfConfigRulesExceededException for service response error code diff --git a/vendor/github.com/aws/aws-sdk-go/service/databasemigrationservice/api.go b/vendor/github.com/aws/aws-sdk-go/service/databasemigrationservice/api.go index 2f746d1cab4..6020100f994 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/databasemigrationservice/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/databasemigrationservice/api.go @@ -10025,12 +10025,16 @@ type ReplicationInstance struct { ReplicationInstanceIdentifier *string `type:"string"` // The private IP address of the replication instance. + // + // Deprecated: ReplicationInstancePrivateIpAddress has been deprecated ReplicationInstancePrivateIpAddress *string `deprecated:"true" type:"string"` // The private IP address of the replication instance. ReplicationInstancePrivateIpAddresses []*string `type:"list"` // The public IP address of the replication instance. + // + // Deprecated: ReplicationInstancePublicIpAddress has been deprecated ReplicationInstancePublicIpAddress *string `deprecated:"true" type:"string"` // The public IP address of the replication instance. diff --git a/vendor/github.com/aws/aws-sdk-go/service/directconnect/api.go b/vendor/github.com/aws/aws-sdk-go/service/directconnect/api.go index 48e01f5a4af..779e1409210 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/directconnect/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/directconnect/api.go @@ -37,6 +37,8 @@ const opAllocateConnectionOnInterconnect = "AllocateConnectionOnInterconnect" // } // // See also, https://docs.aws.amazon.com/goto/WebAPI/directconnect-2012-10-25/AllocateConnectionOnInterconnect +// +// Deprecated: AllocateConnectionOnInterconnect has been deprecated func (c *DirectConnect) AllocateConnectionOnInterconnectRequest(input *AllocateConnectionOnInterconnectInput) (req *request.Request, output *Connection) { if c.Client.Config.Logger != nil { c.Client.Config.Logger.Log("This operation, AllocateConnectionOnInterconnect, has been deprecated") @@ -84,6 +86,8 @@ func (c *DirectConnect) AllocateConnectionOnInterconnectRequest(input *AllocateC // additional details about the cause. // // See also, https://docs.aws.amazon.com/goto/WebAPI/directconnect-2012-10-25/AllocateConnectionOnInterconnect +// +// Deprecated: AllocateConnectionOnInterconnect has been deprecated func (c *DirectConnect) AllocateConnectionOnInterconnect(input *AllocateConnectionOnInterconnectInput) (*Connection, error) { req, out := c.AllocateConnectionOnInterconnectRequest(input) return out, req.Send() @@ -98,6 +102,8 @@ func (c *DirectConnect) AllocateConnectionOnInterconnect(input *AllocateConnecti // the context is nil a panic will occur. In the future the SDK may create // sub-contexts for http.Requests. See https://golang.org/pkg/context/ // for more information on using Contexts. +// +// Deprecated: AllocateConnectionOnInterconnectWithContext has been deprecated func (c *DirectConnect) AllocateConnectionOnInterconnectWithContext(ctx aws.Context, input *AllocateConnectionOnInterconnectInput, opts ...request.Option) (*Connection, error) { req, out := c.AllocateConnectionOnInterconnectRequest(input) req.SetContext(ctx) @@ -2324,6 +2330,8 @@ const opDescribeConnectionLoa = "DescribeConnectionLoa" // } // // See also, https://docs.aws.amazon.com/goto/WebAPI/directconnect-2012-10-25/DescribeConnectionLoa +// +// Deprecated: DescribeConnectionLoa has been deprecated func (c *DirectConnect) DescribeConnectionLoaRequest(input *DescribeConnectionLoaInput) (req *request.Request, output *DescribeConnectionLoaOutput) { if c.Client.Config.Logger != nil { c.Client.Config.Logger.Log("This operation, DescribeConnectionLoa, has been deprecated") @@ -2372,6 +2380,8 @@ func (c *DirectConnect) DescribeConnectionLoaRequest(input *DescribeConnectionLo // additional details about the cause. // // See also, https://docs.aws.amazon.com/goto/WebAPI/directconnect-2012-10-25/DescribeConnectionLoa +// +// Deprecated: DescribeConnectionLoa has been deprecated func (c *DirectConnect) DescribeConnectionLoa(input *DescribeConnectionLoaInput) (*DescribeConnectionLoaOutput, error) { req, out := c.DescribeConnectionLoaRequest(input) return out, req.Send() @@ -2386,6 +2396,8 @@ func (c *DirectConnect) DescribeConnectionLoa(input *DescribeConnectionLoaInput) // the context is nil a panic will occur. In the future the SDK may create // sub-contexts for http.Requests. See https://golang.org/pkg/context/ // for more information on using Contexts. +// +// Deprecated: DescribeConnectionLoaWithContext has been deprecated func (c *DirectConnect) DescribeConnectionLoaWithContext(ctx aws.Context, input *DescribeConnectionLoaInput, opts ...request.Option) (*DescribeConnectionLoaOutput, error) { req, out := c.DescribeConnectionLoaRequest(input) req.SetContext(ctx) @@ -2505,6 +2517,8 @@ const opDescribeConnectionsOnInterconnect = "DescribeConnectionsOnInterconnect" // } // // See also, https://docs.aws.amazon.com/goto/WebAPI/directconnect-2012-10-25/DescribeConnectionsOnInterconnect +// +// Deprecated: DescribeConnectionsOnInterconnect has been deprecated func (c *DirectConnect) DescribeConnectionsOnInterconnectRequest(input *DescribeConnectionsOnInterconnectInput) (req *request.Request, output *Connections) { if c.Client.Config.Logger != nil { c.Client.Config.Logger.Log("This operation, DescribeConnectionsOnInterconnect, has been deprecated") @@ -2549,6 +2563,8 @@ func (c *DirectConnect) DescribeConnectionsOnInterconnectRequest(input *Describe // additional details about the cause. // // See also, https://docs.aws.amazon.com/goto/WebAPI/directconnect-2012-10-25/DescribeConnectionsOnInterconnect +// +// Deprecated: DescribeConnectionsOnInterconnect has been deprecated func (c *DirectConnect) DescribeConnectionsOnInterconnect(input *DescribeConnectionsOnInterconnectInput) (*Connections, error) { req, out := c.DescribeConnectionsOnInterconnectRequest(input) return out, req.Send() @@ -2563,6 +2579,8 @@ func (c *DirectConnect) DescribeConnectionsOnInterconnect(input *DescribeConnect // the context is nil a panic will occur. In the future the SDK may create // sub-contexts for http.Requests. See https://golang.org/pkg/context/ // for more information on using Contexts. +// +// Deprecated: DescribeConnectionsOnInterconnectWithContext has been deprecated func (c *DirectConnect) DescribeConnectionsOnInterconnectWithContext(ctx aws.Context, input *DescribeConnectionsOnInterconnectInput, opts ...request.Option) (*Connections, error) { req, out := c.DescribeConnectionsOnInterconnectRequest(input) req.SetContext(ctx) @@ -2951,6 +2969,8 @@ const opDescribeInterconnectLoa = "DescribeInterconnectLoa" // } // // See also, https://docs.aws.amazon.com/goto/WebAPI/directconnect-2012-10-25/DescribeInterconnectLoa +// +// Deprecated: DescribeInterconnectLoa has been deprecated func (c *DirectConnect) DescribeInterconnectLoaRequest(input *DescribeInterconnectLoaInput) (req *request.Request, output *DescribeInterconnectLoaOutput) { if c.Client.Config.Logger != nil { c.Client.Config.Logger.Log("This operation, DescribeInterconnectLoa, has been deprecated") @@ -2999,6 +3019,8 @@ func (c *DirectConnect) DescribeInterconnectLoaRequest(input *DescribeInterconne // additional details about the cause. // // See also, https://docs.aws.amazon.com/goto/WebAPI/directconnect-2012-10-25/DescribeInterconnectLoa +// +// Deprecated: DescribeInterconnectLoa has been deprecated func (c *DirectConnect) DescribeInterconnectLoa(input *DescribeInterconnectLoaInput) (*DescribeInterconnectLoaOutput, error) { req, out := c.DescribeInterconnectLoaRequest(input) return out, req.Send() @@ -3013,6 +3035,8 @@ func (c *DirectConnect) DescribeInterconnectLoa(input *DescribeInterconnectLoaIn // the context is nil a panic will occur. In the future the SDK may create // sub-contexts for http.Requests. See https://golang.org/pkg/context/ // for more information on using Contexts. +// +// Deprecated: DescribeInterconnectLoaWithContext has been deprecated func (c *DirectConnect) DescribeInterconnectLoaWithContext(ctx aws.Context, input *DescribeInterconnectLoaInput, opts ...request.Option) (*DescribeInterconnectLoaOutput, error) { req, out := c.DescribeInterconnectLoaRequest(input) req.SetContext(ctx) diff --git a/vendor/github.com/aws/aws-sdk-go/service/dynamodb/api.go b/vendor/github.com/aws/aws-sdk-go/service/dynamodb/api.go index be7f390291f..332b76dd472 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/dynamodb/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/dynamodb/api.go @@ -1260,6 +1260,78 @@ func (c *DynamoDB) DescribeContinuousBackupsWithContext(ctx aws.Context, input * return out, req.Send() } +const opDescribeEndpoints = "DescribeEndpoints" + +// DescribeEndpointsRequest generates a "aws/request.Request" representing the +// client's request for the DescribeEndpoints operation. The "output" return +// value will be populated with the request's response once the request completes +// successfuly. +// +// Use "Send" method on the returned Request to send the API call to the service. +// the "output" return value is not valid until after Send returns without error. +// +// See DescribeEndpoints for more information on using the DescribeEndpoints +// API call, and error handling. +// +// This method is useful when you want to inject custom logic or configuration +// into the SDK's request lifecycle. Such as custom headers, or retry logic. +// +// +// // Example sending a request using the DescribeEndpointsRequest method. +// req, resp := client.DescribeEndpointsRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/dynamodb-2012-08-10/DescribeEndpoints +func (c *DynamoDB) DescribeEndpointsRequest(input *DescribeEndpointsInput) (req *request.Request, output *DescribeEndpointsOutput) { + op := &request.Operation{ + Name: opDescribeEndpoints, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &DescribeEndpointsInput{} + } + + output = &DescribeEndpointsOutput{} + req = c.newRequest(op, input, output) + return +} + +// DescribeEndpoints API operation for Amazon DynamoDB. +// +// Returns awserr.Error for service API and SDK errors. Use runtime type assertions +// with awserr.Error's Code and Message methods to get detailed information about +// the error. +// +// See the AWS API reference guide for Amazon DynamoDB's +// API operation DescribeEndpoints for usage and error information. +// See also, https://docs.aws.amazon.com/goto/WebAPI/dynamodb-2012-08-10/DescribeEndpoints +func (c *DynamoDB) DescribeEndpoints(input *DescribeEndpointsInput) (*DescribeEndpointsOutput, error) { + req, out := c.DescribeEndpointsRequest(input) + return out, req.Send() +} + +// DescribeEndpointsWithContext is the same as DescribeEndpoints with the addition of +// the ability to pass a context and additional request options. +// +// See DescribeEndpoints for details on how to use this API operation. +// +// The context must be non-nil and will be used for request cancellation. If +// the context is nil a panic will occur. In the future the SDK may create +// sub-contexts for http.Requests. See https://golang.org/pkg/context/ +// for more information on using Contexts. +func (c *DynamoDB) DescribeEndpointsWithContext(ctx aws.Context, input *DescribeEndpointsInput, opts ...request.Option) (*DescribeEndpointsOutput, error) { + req, out := c.DescribeEndpointsRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opDescribeGlobalTable = "DescribeGlobalTable" // DescribeGlobalTableRequest generates a "aws/request.Request" representing the @@ -6756,6 +6828,43 @@ func (s *DescribeContinuousBackupsOutput) SetContinuousBackupsDescription(v *Con return s } +type DescribeEndpointsInput struct { + _ struct{} `type:"structure"` +} + +// String returns the string representation +func (s DescribeEndpointsInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DescribeEndpointsInput) GoString() string { + return s.String() +} + +type DescribeEndpointsOutput struct { + _ struct{} `type:"structure"` + + // Endpoints is a required field + Endpoints []*Endpoint `type:"list" required:"true"` +} + +// String returns the string representation +func (s DescribeEndpointsOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DescribeEndpointsOutput) GoString() string { + return s.String() +} + +// SetEndpoints sets the Endpoints field's value. +func (s *DescribeEndpointsOutput) SetEndpoints(v []*Endpoint) *DescribeEndpointsOutput { + s.Endpoints = v + return s +} + type DescribeGlobalTableInput struct { _ struct{} `type:"structure"` @@ -7095,6 +7204,38 @@ func (s *DescribeTimeToLiveOutput) SetTimeToLiveDescription(v *TimeToLiveDescrip return s } +type Endpoint struct { + _ struct{} `type:"structure"` + + // Address is a required field + Address *string `type:"string" required:"true"` + + // CachePeriodInMinutes is a required field + CachePeriodInMinutes *int64 `type:"long" required:"true"` +} + +// String returns the string representation +func (s Endpoint) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s Endpoint) GoString() string { + return s.String() +} + +// SetAddress sets the Address field's value. +func (s *Endpoint) SetAddress(v string) *Endpoint { + s.Address = &v + return s +} + +// SetCachePeriodInMinutes sets the CachePeriodInMinutes field's value. +func (s *Endpoint) SetCachePeriodInMinutes(v int64) *Endpoint { + s.CachePeriodInMinutes = &v + return s +} + // Represents a condition to be compared with an attribute value. This condition // can be used with DeleteItem, PutItem or UpdateItem operations; if the comparison // evaluates to true, the operation succeeds; if not, the operation fails. You diff --git a/vendor/github.com/aws/aws-sdk-go/service/elastictranscoder/api.go b/vendor/github.com/aws/aws-sdk-go/service/elastictranscoder/api.go index 9ba387e93eb..69f5360c8ea 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/elastictranscoder/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/elastictranscoder/api.go @@ -1471,6 +1471,8 @@ const opTestRole = "TestRole" // if err == nil { // resp is now filled // fmt.Println(resp) // } +// +// Deprecated: TestRole has been deprecated func (c *ElasticTranscoder) TestRoleRequest(input *TestRoleInput) (req *request.Request, output *TestRoleOutput) { if c.Client.Config.Logger != nil { c.Client.Config.Logger.Log("This operation, TestRole, has been deprecated") @@ -1525,6 +1527,8 @@ func (c *ElasticTranscoder) TestRoleRequest(input *TestRoleInput) (req *request. // Elastic Transcoder encountered an unexpected exception while trying to fulfill // the request. // +// +// Deprecated: TestRole has been deprecated func (c *ElasticTranscoder) TestRole(input *TestRoleInput) (*TestRoleOutput, error) { req, out := c.TestRoleRequest(input) return out, req.Send() @@ -1539,6 +1543,8 @@ func (c *ElasticTranscoder) TestRole(input *TestRoleInput) (*TestRoleOutput, err // the context is nil a panic will occur. In the future the SDK may create // sub-contexts for http.Requests. See https://golang.org/pkg/context/ // for more information on using Contexts. +// +// Deprecated: TestRoleWithContext has been deprecated func (c *ElasticTranscoder) TestRoleWithContext(ctx aws.Context, input *TestRoleInput, opts ...request.Option) (*TestRoleOutput, error) { req, out := c.TestRoleRequest(input) req.SetContext(ctx) @@ -2539,6 +2545,8 @@ type Captions struct { // Source files for the input sidecar captions used during the transcoding process. // To omit all sidecar captions, leave CaptionSources blank. + // + // Deprecated: CaptionSources has been deprecated CaptionSources []*CaptionSource `deprecated:"true" type:"list"` // A policy that determines how Elastic Transcoder handles the existence of @@ -2560,6 +2568,8 @@ type Captions struct { // you specify in CaptionSources. // // MergePolicy cannot be null. + // + // Deprecated: MergePolicy has been deprecated MergePolicy *string `deprecated:"true" type:"string"` } @@ -2613,6 +2623,8 @@ func (s *Captions) SetMergePolicy(v string) *Captions { // Settings for one clip in a composition. All jobs in a playlist must have // the same clip settings. +// +// Deprecated: Clip has been deprecated type Clip struct { _ struct{} `deprecated:"true" type:"structure"` @@ -2858,6 +2870,8 @@ type CreateJobOutput struct { // of the file. The Composition object contains settings for the clips that // make up an output file. For the current release, you can only specify settings // for a single clip per output file. The Composition object cannot be null. + // + // Deprecated: Composition has been deprecated Composition []*Clip `deprecated:"true" type:"list"` // You can specify encryption settings for any output files that you want to @@ -4631,6 +4645,8 @@ type JobOutput struct { // of the file. The Composition object contains settings for the clips that // make up an output file. For the current release, you can only specify settings // for a single clip per output file. The Composition object cannot be null. + // + // Deprecated: Composition has been deprecated Composition []*Clip `deprecated:"true" type:"list"` // Duration of the output file, in seconds. @@ -6589,6 +6605,8 @@ func (s *ReadPresetOutput) SetPreset(v *Preset) *ReadPresetOutput { } // The TestRoleRequest structure. +// +// Deprecated: TestRoleInput has been deprecated type TestRoleInput struct { _ struct{} `deprecated:"true" type:"structure"` @@ -6674,6 +6692,8 @@ func (s *TestRoleInput) SetTopics(v []*string) *TestRoleInput { } // The TestRoleResponse structure. +// +// Deprecated: TestRoleOutput has been deprecated type TestRoleOutput struct { _ struct{} `deprecated:"true" type:"structure"` diff --git a/vendor/github.com/aws/aws-sdk-go/service/elb/api.go b/vendor/github.com/aws/aws-sdk-go/service/elb/api.go index c41d020c5c2..bb3af054023 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/elb/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/elb/api.go @@ -62,7 +62,7 @@ func (c *ELB) AddTagsRequest(input *AddTagsInput) (req *request.Request, output // key is already associated with the load balancer, AddTags updates its value. // // For more information, see Tag Your Classic Load Balancer (http://docs.aws.amazon.com/elasticloadbalancing/latest/classic/add-remove-tags.html) -// in the Classic Load Balancer Guide. +// in the Classic Load Balancers Guide. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about @@ -153,7 +153,7 @@ func (c *ELB) ApplySecurityGroupsToLoadBalancerRequest(input *ApplySecurityGroup // associated security groups. // // For more information, see Security Groups for Load Balancers in a VPC (http://docs.aws.amazon.com/elasticloadbalancing/latest/classic/elb-security-groups.html#elb-vpc-security-groups) -// in the Classic Load Balancer Guide. +// in the Classic Load Balancers Guide. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about @@ -244,7 +244,7 @@ func (c *ELB) AttachLoadBalancerToSubnetsRequest(input *AttachLoadBalancerToSubn // The load balancer evenly distributes requests across all registered subnets. // For more information, see Add or Remove Subnets for Your Load Balancer in // a VPC (http://docs.aws.amazon.com/elasticloadbalancing/latest/classic/elb-manage-subnets.html) -// in the Classic Load Balancer Guide. +// in the Classic Load Balancers Guide. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about @@ -337,7 +337,7 @@ func (c *ELB) ConfigureHealthCheckRequest(input *ConfigureHealthCheckInput) (req // // For more information, see Configure Health Checks for Your Load Balancer // (http://docs.aws.amazon.com/elasticloadbalancing/latest/classic/elb-healthchecks.html) -// in the Classic Load Balancer Guide. +// in the Classic Load Balancers Guide. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about @@ -430,7 +430,7 @@ func (c *ELB) CreateAppCookieStickinessPolicyRequest(input *CreateAppCookieStick // being sticky until a new application cookie is issued. // // For more information, see Application-Controlled Session Stickiness (http://docs.aws.amazon.com/elasticloadbalancing/latest/classic/elb-sticky-sessions.html#enable-sticky-sessions-application) -// in the Classic Load Balancer Guide. +// in the Classic Load Balancers Guide. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about @@ -534,7 +534,7 @@ func (c *ELB) CreateLBCookieStickinessPolicyRequest(input *CreateLBCookieStickin // cookie expiration time, which is specified in the policy configuration. // // For more information, see Duration-Based Session Stickiness (http://docs.aws.amazon.com/elasticloadbalancing/latest/classic/elb-sticky-sessions.html#enable-sticky-sessions-duration) -// in the Classic Load Balancer Guide. +// in the Classic Load Balancers Guide. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about @@ -634,7 +634,7 @@ func (c *ELB) CreateLoadBalancerRequest(input *CreateLoadBalancerInput) (req *re // You can create up to 20 load balancers per region per account. You can request // an increase for the number of load balancers for your account. For more information, // see Limits for Your Classic Load Balancer (http://docs.aws.amazon.com/elasticloadbalancing/latest/classic/elb-limits.html) -// in the Classic Load Balancer Guide. +// in the Classic Load Balancers Guide. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about @@ -757,7 +757,7 @@ func (c *ELB) CreateLoadBalancerListenersRequest(input *CreateLoadBalancerListen // listener. // // For more information, see Listeners for Your Classic Load Balancer (http://docs.aws.amazon.com/elasticloadbalancing/latest/classic/elb-listener-config.html) -// in the Classic Load Balancer Guide. +// in the Classic Load Balancers Guide. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about @@ -1200,7 +1200,7 @@ func (c *ELB) DeregisterInstancesFromLoadBalancerRequest(input *DeregisterInstan // from the load balancer. // // For more information, see Register or De-Register EC2 Instances (http://docs.aws.amazon.com/elasticloadbalancing/latest/classic/elb-deregister-register-instances.html) -// in the Classic Load Balancer Guide. +// in the Classic Load Balancers Guide. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about @@ -1286,7 +1286,7 @@ func (c *ELB) DescribeAccountLimitsRequest(input *DescribeAccountLimitsInput) (r // account. // // For more information, see Limits for Your Classic Load Balancer (http://docs.aws.amazon.com/elasticloadbalancing/latest/classic/elb-limits.html) -// in the Classic Load Balancer Guide. +// in the Classic Load Balancers Guide. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about @@ -1729,6 +1729,8 @@ func (c *ELB) DescribeLoadBalancersRequest(input *DescribeLoadBalancersInput) (r // The specified load balancer does not exist. // // * ErrCodeDependencyThrottleException "DependencyThrottle" +// A request made by Elastic Load Balancing to another service exceeds the maximum +// request rate permitted for your account. // // See also, https://docs.aws.amazon.com/goto/WebAPI/elasticloadbalancing-2012-06-01/DescribeLoadBalancers func (c *ELB) DescribeLoadBalancers(input *DescribeLoadBalancersInput) (*DescribeLoadBalancersOutput, error) { @@ -2013,7 +2015,9 @@ func (c *ELB) DisableAvailabilityZonesForLoadBalancerRequest(input *DisableAvail // DisableAvailabilityZonesForLoadBalancer API operation for Elastic Load Balancing. // // Removes the specified Availability Zones from the set of Availability Zones -// for the specified load balancer. +// for the specified load balancer in EC2-Classic or a default VPC. +// +// For load balancers in a non-default VPC, use DetachLoadBalancerFromSubnets. // // There must be at least one Availability Zone registered with a load balancer // at all times. After an Availability Zone is removed, all instances registered @@ -2022,7 +2026,7 @@ func (c *ELB) DisableAvailabilityZonesForLoadBalancerRequest(input *DisableAvail // the traffic among its remaining Availability Zones. // // For more information, see Add or Remove Availability Zones (http://docs.aws.amazon.com/elasticloadbalancing/latest/classic/enable-disable-az.html) -// in the Classic Load Balancer Guide. +// in the Classic Load Balancers Guide. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about @@ -2105,13 +2109,14 @@ func (c *ELB) EnableAvailabilityZonesForLoadBalancerRequest(input *EnableAvailab // EnableAvailabilityZonesForLoadBalancer API operation for Elastic Load Balancing. // // Adds the specified Availability Zones to the set of Availability Zones for -// the specified load balancer. +// the specified load balancer in EC2-Classic or a default VPC. // -// The load balancer evenly distributes requests across all its registered Availability -// Zones that contain instances. +// For load balancers in a non-default VPC, use AttachLoadBalancerToSubnets. // -// For more information, see Add or Remove Availability Zones (http://docs.aws.amazon.com/elasticloadbalancing/latest/classic/enable-disable-az.html) -// in the Classic Load Balancer Guide. +// The load balancer evenly distributes requests across all its registered Availability +// Zones that contain instances. For more information, see Add or Remove Availability +// Zones (http://docs.aws.amazon.com/elasticloadbalancing/latest/classic/enable-disable-az.html) +// in the Classic Load Balancers Guide. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about @@ -2197,7 +2202,7 @@ func (c *ELB) ModifyLoadBalancerAttributesRequest(input *ModifyLoadBalancerAttri // can modify the load balancer attribute ConnectionSettings by specifying an // idle connection timeout value for your load balancer. // -// For more information, see the following in the Classic Load Balancer Guide: +// For more information, see the following in the Classic Load Balancers Guide: // // * Cross-Zone Load Balancing (http://docs.aws.amazon.com/elasticloadbalancing/latest/classic/enable-disable-crosszone-lb.html) // @@ -2312,7 +2317,7 @@ func (c *ELB) RegisterInstancesWithLoadBalancerRequest(input *RegisterInstancesW // To deregister instances from a load balancer, use DeregisterInstancesFromLoadBalancer. // // For more information, see Register or De-Register EC2 Instances (http://docs.aws.amazon.com/elasticloadbalancing/latest/classic/elb-deregister-register-instances.html) -// in the Classic Load Balancer Guide. +// in the Classic Load Balancers Guide. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about @@ -2479,7 +2484,7 @@ func (c *ELB) SetLoadBalancerListenerSSLCertificateRequest(input *SetLoadBalance // // For more information about updating your SSL certificate, see Replace the // SSL Certificate for Your Load Balancer (http://docs.aws.amazon.com/elasticloadbalancing/latest/classic/elb-update-ssl-cert.html) -// in the Classic Load Balancer Guide. +// in the Classic Load Balancers Guide. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about @@ -2586,9 +2591,9 @@ func (c *ELB) SetLoadBalancerPoliciesForBackendServerRequest(input *SetLoadBalan // // For more information about enabling back-end instance authentication, see // Configure Back-end Instance Authentication (http://docs.aws.amazon.com/elasticloadbalancing/latest/classic/elb-create-https-ssl-load-balancer.html#configure_backendauth_clt) -// in the Classic Load Balancer Guide. For more information about Proxy Protocol, +// in the Classic Load Balancers Guide. For more information about Proxy Protocol, // see Configure Proxy Protocol Support (http://docs.aws.amazon.com/elasticloadbalancing/latest/classic/enable-proxy-protocol.html) -// in the Classic Load Balancer Guide. +// in the Classic Load Balancers Guide. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about @@ -2682,7 +2687,7 @@ func (c *ELB) SetLoadBalancerPoliciesOfListenerRequest(input *SetLoadBalancerPol // Configuration (http://docs.aws.amazon.com/elasticloadbalancing/latest/classic/ssl-config-update.html), // Duration-Based Session Stickiness (http://docs.aws.amazon.com/elasticloadbalancing/latest/classic/elb-sticky-sessions.html#enable-sticky-sessions-duration), // and Application-Controlled Session Stickiness (http://docs.aws.amazon.com/elasticloadbalancing/latest/classic/elb-sticky-sessions.html#enable-sticky-sessions-application) -// in the Classic Load Balancer Guide. +// in the Classic Load Balancers Guide. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about @@ -3489,7 +3494,7 @@ type CreateLoadBalancerInput struct { // The listeners. // // For more information, see Listeners for Your Classic Load Balancer (http://docs.aws.amazon.com/elasticloadbalancing/latest/classic/elb-listener-config.html) - // in the Classic Load Balancer Guide. + // in the Classic Load Balancers Guide. // // Listeners is a required field Listeners []*Listener `type:"list" required:"true"` @@ -3526,7 +3531,7 @@ type CreateLoadBalancerInput struct { // // For more information about tagging your load balancer, see Tag Your Classic // Load Balancer (http://docs.aws.amazon.com/elasticloadbalancing/latest/classic/add-remove-tags.html) - // in the Classic Load Balancer Guide. + // in the Classic Load Balancers Guide. Tags []*Tag `min:"1" type:"list"` } @@ -5115,6 +5120,8 @@ type Limit struct { // * classic-listeners // // * classic-load-balancers + // + // * classic-registered-instances Name *string `type:"string"` } @@ -5144,7 +5151,7 @@ func (s *Limit) SetName(v string) *Limit { // // For information about the protocols and the ports supported by Elastic Load // Balancing, see Listeners for Your Classic Load Balancer (http://docs.aws.amazon.com/elasticloadbalancing/latest/classic/elb-listener-config.html) -// in the Classic Load Balancer Guide. +// in the Classic Load Balancers Guide. type Listener struct { _ struct{} `type:"structure"` @@ -5286,7 +5293,7 @@ type LoadBalancerAttributes struct { // and delivers the information to the Amazon S3 bucket that you specify. // // For more information, see Enable Access Logs (http://docs.aws.amazon.com/elasticloadbalancing/latest/classic/enable-access-logs.html) - // in the Classic Load Balancer Guide. + // in the Classic Load Balancers Guide. AccessLog *AccessLog `type:"structure"` // This parameter is reserved. @@ -5296,7 +5303,7 @@ type LoadBalancerAttributes struct { // the load balancer shifts traffic away from a deregistered or unhealthy instance. // // For more information, see Configure Connection Draining (http://docs.aws.amazon.com/elasticloadbalancing/latest/classic/config-conn-drain.html) - // in the Classic Load Balancer Guide. + // in the Classic Load Balancers Guide. ConnectionDraining *ConnectionDraining `type:"structure"` // If enabled, the load balancer allows the connections to remain idle (no data @@ -5305,14 +5312,14 @@ type LoadBalancerAttributes struct { // By default, Elastic Load Balancing maintains a 60-second idle connection // timeout for both front-end and back-end connections of your load balancer. // For more information, see Configure Idle Connection Timeout (http://docs.aws.amazon.com/elasticloadbalancing/latest/classic/config-idle-timeout.html) - // in the Classic Load Balancer Guide. + // in the Classic Load Balancers Guide. ConnectionSettings *ConnectionSettings `type:"structure"` // If enabled, the load balancer routes the request traffic evenly across all // instances regardless of the Availability Zones. // // For more information, see Configure Cross-Zone Load Balancing (http://docs.aws.amazon.com/elasticloadbalancing/latest/classic/enable-disable-crosszone-lb.html) - // in the Classic Load Balancer Guide. + // in the Classic Load Balancers Guide. CrossZoneLoadBalancing *CrossZoneLoadBalancing `type:"structure"` } @@ -5399,7 +5406,7 @@ type LoadBalancerDescription struct { // The DNS name of the load balancer. // // For more information, see Configure a Custom Domain Name (http://docs.aws.amazon.com/elasticloadbalancing/latest/classic/using-domain-names-with-elb.html) - // in the Classic Load Balancer Guide. + // in the Classic Load Balancers Guide. CanonicalHostedZoneName *string `type:"string"` // The ID of the Amazon Route 53 hosted zone for the load balancer. diff --git a/vendor/github.com/aws/aws-sdk-go/service/elb/errors.go b/vendor/github.com/aws/aws-sdk-go/service/elb/errors.go index fbf2140d87a..14f1e6717e4 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/elb/errors.go +++ b/vendor/github.com/aws/aws-sdk-go/service/elb/errors.go @@ -21,6 +21,9 @@ const ( // ErrCodeDependencyThrottleException for service response error code // "DependencyThrottle". + // + // A request made by Elastic Load Balancing to another service exceeds the maximum + // request rate permitted for your account. ErrCodeDependencyThrottleException = "DependencyThrottle" // ErrCodeDuplicateAccessPointNameException for service response error code diff --git a/vendor/github.com/aws/aws-sdk-go/service/emr/api.go b/vendor/github.com/aws/aws-sdk-go/service/emr/api.go index 12fe5fb54ba..7ca8a0e7292 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/emr/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/emr/api.go @@ -725,6 +725,8 @@ const opDescribeJobFlows = "DescribeJobFlows" // } // // See also, https://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/DescribeJobFlows +// +// Deprecated: DescribeJobFlows has been deprecated func (c *EMR) DescribeJobFlowsRequest(input *DescribeJobFlowsInput) (req *request.Request, output *DescribeJobFlowsOutput) { if c.Client.Config.Logger != nil { c.Client.Config.Logger.Log("This operation, DescribeJobFlows, has been deprecated") @@ -780,6 +782,8 @@ func (c *EMR) DescribeJobFlowsRequest(input *DescribeJobFlowsInput) (req *reques // request was not completed. // // See also, https://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/DescribeJobFlows +// +// Deprecated: DescribeJobFlows has been deprecated func (c *EMR) DescribeJobFlows(input *DescribeJobFlowsInput) (*DescribeJobFlowsOutput, error) { req, out := c.DescribeJobFlowsRequest(input) return out, req.Send() @@ -794,6 +798,8 @@ func (c *EMR) DescribeJobFlows(input *DescribeJobFlowsInput) (*DescribeJobFlowsO // the context is nil a panic will occur. In the future the SDK may create // sub-contexts for http.Requests. See https://golang.org/pkg/context/ // for more information on using Contexts. +// +// Deprecated: DescribeJobFlowsWithContext has been deprecated func (c *EMR) DescribeJobFlowsWithContext(ctx aws.Context, input *DescribeJobFlowsInput, opts ...request.Option) (*DescribeJobFlowsOutput, error) { req, out := c.DescribeJobFlowsRequest(input) req.SetContext(ctx) diff --git a/vendor/github.com/aws/aws-sdk-go/service/firehose/api.go b/vendor/github.com/aws/aws-sdk-go/service/firehose/api.go index 5718acff4e1..5c11bf73a4f 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/firehose/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/firehose/api.go @@ -1282,6 +1282,8 @@ type CreateDeliveryStreamInput struct { RedshiftDestinationConfiguration *RedshiftDestinationConfiguration `type:"structure"` // [Deprecated] The destination in Amazon S3. You can specify only one destination. + // + // Deprecated: S3DestinationConfiguration has been deprecated S3DestinationConfiguration *S3DestinationConfiguration `deprecated:"true" type:"structure"` // The destination in Splunk. You can specify only one destination. @@ -5822,6 +5824,8 @@ type UpdateDestinationInput struct { RedshiftDestinationUpdate *RedshiftDestinationUpdate `type:"structure"` // [Deprecated] Describes an update for a destination in Amazon S3. + // + // Deprecated: S3DestinationUpdate has been deprecated S3DestinationUpdate *S3DestinationUpdate `deprecated:"true" type:"structure"` // Describes an update for a destination in Splunk. diff --git a/vendor/github.com/aws/aws-sdk-go/service/iot/api.go b/vendor/github.com/aws/aws-sdk-go/service/iot/api.go index 5d610e3a8f5..bbecfc05950 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/iot/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/iot/api.go @@ -415,6 +415,8 @@ const opAttachPrincipalPolicy = "AttachPrincipalPolicy" // if err == nil { // resp is now filled // fmt.Println(resp) // } +// +// Deprecated: AttachPrincipalPolicy has been deprecated func (c *IoT) AttachPrincipalPolicyRequest(input *AttachPrincipalPolicyInput) (req *request.Request, output *AttachPrincipalPolicyOutput) { if c.Client.Config.Logger != nil { c.Client.Config.Logger.Log("This operation, AttachPrincipalPolicy, has been deprecated") @@ -472,6 +474,8 @@ func (c *IoT) AttachPrincipalPolicyRequest(input *AttachPrincipalPolicyInput) (r // * ErrCodeLimitExceededException "LimitExceededException" // A limit has been exceeded. // +// +// Deprecated: AttachPrincipalPolicy has been deprecated func (c *IoT) AttachPrincipalPolicy(input *AttachPrincipalPolicyInput) (*AttachPrincipalPolicyOutput, error) { req, out := c.AttachPrincipalPolicyRequest(input) return out, req.Send() @@ -486,6 +490,8 @@ func (c *IoT) AttachPrincipalPolicy(input *AttachPrincipalPolicyInput) (*AttachP // the context is nil a panic will occur. In the future the SDK may create // sub-contexts for http.Requests. See https://golang.org/pkg/context/ // for more information on using Contexts. +// +// Deprecated: AttachPrincipalPolicyWithContext has been deprecated func (c *IoT) AttachPrincipalPolicyWithContext(ctx aws.Context, input *AttachPrincipalPolicyInput, opts ...request.Option) (*AttachPrincipalPolicyOutput, error) { req, out := c.AttachPrincipalPolicyRequest(input) req.SetContext(ctx) @@ -6223,6 +6229,8 @@ const opDetachPrincipalPolicy = "DetachPrincipalPolicy" // if err == nil { // resp is now filled // fmt.Println(resp) // } +// +// Deprecated: DetachPrincipalPolicy has been deprecated func (c *IoT) DetachPrincipalPolicyRequest(input *DetachPrincipalPolicyInput) (req *request.Request, output *DetachPrincipalPolicyOutput) { if c.Client.Config.Logger != nil { c.Client.Config.Logger.Log("This operation, DetachPrincipalPolicy, has been deprecated") @@ -6276,6 +6284,8 @@ func (c *IoT) DetachPrincipalPolicyRequest(input *DetachPrincipalPolicyInput) (r // * ErrCodeInternalFailureException "InternalFailureException" // An unexpected error has occurred. // +// +// Deprecated: DetachPrincipalPolicy has been deprecated func (c *IoT) DetachPrincipalPolicy(input *DetachPrincipalPolicyInput) (*DetachPrincipalPolicyOutput, error) { req, out := c.DetachPrincipalPolicyRequest(input) return out, req.Send() @@ -6290,6 +6300,8 @@ func (c *IoT) DetachPrincipalPolicy(input *DetachPrincipalPolicyInput) (*DetachP // the context is nil a panic will occur. In the future the SDK may create // sub-contexts for http.Requests. See https://golang.org/pkg/context/ // for more information on using Contexts. +// +// Deprecated: DetachPrincipalPolicyWithContext has been deprecated func (c *IoT) DetachPrincipalPolicyWithContext(ctx aws.Context, input *DetachPrincipalPolicyInput, opts ...request.Option) (*DetachPrincipalPolicyOutput, error) { req, out := c.DetachPrincipalPolicyRequest(input) req.SetContext(ctx) @@ -8864,6 +8876,8 @@ const opListPolicyPrincipals = "ListPolicyPrincipals" // if err == nil { // resp is now filled // fmt.Println(resp) // } +// +// Deprecated: ListPolicyPrincipals has been deprecated func (c *IoT) ListPolicyPrincipalsRequest(input *ListPolicyPrincipalsInput) (req *request.Request, output *ListPolicyPrincipalsOutput) { if c.Client.Config.Logger != nil { c.Client.Config.Logger.Log("This operation, ListPolicyPrincipals, has been deprecated") @@ -8915,6 +8929,8 @@ func (c *IoT) ListPolicyPrincipalsRequest(input *ListPolicyPrincipalsInput) (req // * ErrCodeInternalFailureException "InternalFailureException" // An unexpected error has occurred. // +// +// Deprecated: ListPolicyPrincipals has been deprecated func (c *IoT) ListPolicyPrincipals(input *ListPolicyPrincipalsInput) (*ListPolicyPrincipalsOutput, error) { req, out := c.ListPolicyPrincipalsRequest(input) return out, req.Send() @@ -8929,6 +8945,8 @@ func (c *IoT) ListPolicyPrincipals(input *ListPolicyPrincipalsInput) (*ListPolic // the context is nil a panic will occur. In the future the SDK may create // sub-contexts for http.Requests. See https://golang.org/pkg/context/ // for more information on using Contexts. +// +// Deprecated: ListPolicyPrincipalsWithContext has been deprecated func (c *IoT) ListPolicyPrincipalsWithContext(ctx aws.Context, input *ListPolicyPrincipalsInput, opts ...request.Option) (*ListPolicyPrincipalsOutput, error) { req, out := c.ListPolicyPrincipalsRequest(input) req.SetContext(ctx) @@ -9051,6 +9069,8 @@ const opListPrincipalPolicies = "ListPrincipalPolicies" // if err == nil { // resp is now filled // fmt.Println(resp) // } +// +// Deprecated: ListPrincipalPolicies has been deprecated func (c *IoT) ListPrincipalPoliciesRequest(input *ListPrincipalPoliciesInput) (req *request.Request, output *ListPrincipalPoliciesOutput) { if c.Client.Config.Logger != nil { c.Client.Config.Logger.Log("This operation, ListPrincipalPolicies, has been deprecated") @@ -9103,6 +9123,8 @@ func (c *IoT) ListPrincipalPoliciesRequest(input *ListPrincipalPoliciesInput) (r // * ErrCodeInternalFailureException "InternalFailureException" // An unexpected error has occurred. // +// +// Deprecated: ListPrincipalPolicies has been deprecated func (c *IoT) ListPrincipalPolicies(input *ListPrincipalPoliciesInput) (*ListPrincipalPoliciesOutput, error) { req, out := c.ListPrincipalPoliciesRequest(input) return out, req.Send() @@ -9117,6 +9139,8 @@ func (c *IoT) ListPrincipalPolicies(input *ListPrincipalPoliciesInput) (*ListPri // the context is nil a panic will occur. In the future the SDK may create // sub-contexts for http.Requests. See https://golang.org/pkg/context/ // for more information on using Contexts. +// +// Deprecated: ListPrincipalPoliciesWithContext has been deprecated func (c *IoT) ListPrincipalPoliciesWithContext(ctx aws.Context, input *ListPrincipalPoliciesInput, opts ...request.Option) (*ListPrincipalPoliciesOutput, error) { req, out := c.ListPrincipalPoliciesRequest(input) req.SetContext(ctx) @@ -28211,6 +28235,8 @@ type RegisterCertificateInput struct { CertificatePem *string `locationName:"certificatePem" min:"1" type:"string" required:"true"` // A boolean value that specifies if the CA certificate is set to active. + // + // Deprecated: SetAsActive has been deprecated SetAsActive *bool `location:"querystring" locationName:"setAsActive" deprecated:"true" type:"boolean"` // The status of the register certificate request. diff --git a/vendor/github.com/aws/aws-sdk-go/service/lambda/api.go b/vendor/github.com/aws/aws-sdk-go/service/lambda/api.go index cd81e47904d..f5fd4eeacc4 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/lambda/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/lambda/api.go @@ -1601,6 +1601,8 @@ const opInvokeAsync = "InvokeAsync" // } // // See also, https://docs.aws.amazon.com/goto/WebAPI/lambda-2015-03-31/InvokeAsync +// +// Deprecated: InvokeAsync has been deprecated func (c *Lambda) InvokeAsyncRequest(input *InvokeAsyncInput) (req *request.Request, output *InvokeAsyncOutput) { if c.Client.Config.Logger != nil { c.Client.Config.Logger.Log("This operation, InvokeAsync, has been deprecated") @@ -1652,6 +1654,8 @@ func (c *Lambda) InvokeAsyncRequest(input *InvokeAsyncInput) (req *request.Reque // The runtime or runtime version specified is not supported. // // See also, https://docs.aws.amazon.com/goto/WebAPI/lambda-2015-03-31/InvokeAsync +// +// Deprecated: InvokeAsync has been deprecated func (c *Lambda) InvokeAsync(input *InvokeAsyncInput) (*InvokeAsyncOutput, error) { req, out := c.InvokeAsyncRequest(input) return out, req.Send() @@ -1666,6 +1670,8 @@ func (c *Lambda) InvokeAsync(input *InvokeAsyncInput) (*InvokeAsyncOutput, error // the context is nil a panic will occur. In the future the SDK may create // sub-contexts for http.Requests. See https://golang.org/pkg/context/ // for more information on using Contexts. +// +// Deprecated: InvokeAsyncWithContext has been deprecated func (c *Lambda) InvokeAsyncWithContext(ctx aws.Context, input *InvokeAsyncInput, opts ...request.Option) (*InvokeAsyncOutput, error) { req, out := c.InvokeAsyncRequest(input) req.SetContext(ctx) @@ -5267,6 +5273,7 @@ func (s *GetPolicyOutput) SetRevisionId(v string) *GetPolicyOutput { return s } +// Deprecated: InvokeAsyncInput has been deprecated type InvokeAsyncInput struct { _ struct{} `deprecated:"true" type:"structure" payload:"InvokeArgs"` @@ -5325,6 +5332,8 @@ func (s *InvokeAsyncInput) SetInvokeArgs(v io.ReadSeeker) *InvokeAsyncInput { } // Upon success, it returns empty response. Otherwise, throws an exception. +// +// Deprecated: InvokeAsyncOutput has been deprecated type InvokeAsyncOutput struct { _ struct{} `deprecated:"true" type:"structure"` diff --git a/vendor/github.com/aws/aws-sdk-go/service/lightsail/api.go b/vendor/github.com/aws/aws-sdk-go/service/lightsail/api.go index 8178113cfb3..8e8583195f2 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/lightsail/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/lightsail/api.go @@ -8914,6 +8914,8 @@ type CreateInstancesInput struct { // // In releases prior to June 12, 2017, this parameter was ignored by the API. // It is now deprecated. + // + // Deprecated: CustomImageName has been deprecated CustomImageName *string `locationName:"customImageName" deprecated:"true" type:"string"` // The names to use for your new Lightsail instances. Separate multiple values @@ -10163,6 +10165,8 @@ type Disk struct { // In releases prior to November 14, 2017, this parameter returned attached // for system disks in the API response. It is now deprecated, but still included // in the response. Use isAttached instead. + // + // Deprecated: AttachmentState has been deprecated AttachmentState *string `locationName:"attachmentState" deprecated:"true" type:"string"` // The date when the disk was created. @@ -10172,6 +10176,8 @@ type Disk struct { // // In releases prior to November 14, 2017, this parameter was not included in // the API response. It is now deprecated. + // + // Deprecated: GbInUse has been deprecated GbInUse *int64 `locationName:"gbInUse" deprecated:"true" type:"integer"` // The input/output operations per second (IOPS) of the disk. @@ -10558,6 +10564,8 @@ type DomainEntry struct { // // In releases prior to November 29, 2017, this parameter was not included in // the API response. It is now deprecated. + // + // Deprecated: Options has been deprecated Options map[string]*string `locationName:"options" deprecated:"true" type:"map"` // The target AWS name server (e.g., ns-111.awsdns-22.com.). @@ -12548,6 +12556,8 @@ type GetOperationsForResourceOutput struct { // // In releases prior to June 12, 2017, this parameter returned null by the API. // It is now deprecated, and the API returns the nextPageToken parameter instead. + // + // Deprecated: NextPageCount has been deprecated NextPageCount *string `locationName:"nextPageCount" deprecated:"true" type:"string"` // An identifier that was returned from the previous call to this operation, diff --git a/vendor/github.com/aws/aws-sdk-go/service/mediaconvert/api.go b/vendor/github.com/aws/aws-sdk-go/service/mediaconvert/api.go index 8d2b3203232..aeba73cd891 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/mediaconvert/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/mediaconvert/api.go @@ -1654,8 +1654,8 @@ func (c *MediaConvert) TagResourceRequest(input *TagResourceInput) (req *request // TagResource API operation for AWS Elemental MediaConvert. // -// Tag a MediaConvert queue, preset, or job template. For information about -// these resource types, see the User Guide at http://docs.aws.amazon.com/mediaconvert/latest/ug/what-is.html +// Add tags to a MediaConvert queue, preset, or job template. For information +// about tagging, see the User Guide at https://docs.aws.amazon.com/mediaconvert/latest/ug/tagging-resources.html // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about @@ -1728,8 +1728,8 @@ const opUntagResource = "UntagResource" func (c *MediaConvert) UntagResourceRequest(input *UntagResourceInput) (req *request.Request, output *UntagResourceOutput) { op := &request.Operation{ Name: opUntagResource, - HTTPMethod: "DELETE", - HTTPPath: "/2017-08-29/tags", + HTTPMethod: "PUT", + HTTPPath: "/2017-08-29/tags/{arn}", } if input == nil { @@ -1743,8 +1743,8 @@ func (c *MediaConvert) UntagResourceRequest(input *UntagResourceInput) (req *req // UntagResource API operation for AWS Elemental MediaConvert. // -// Untag a MediaConvert queue, preset, or job template. For information about -// these resource types, see the User Guide at http://docs.aws.amazon.com/mediaconvert/latest/ug/what-is.html +// Remove tags from a MediaConvert queue, preset, or job template. For information +// about tagging, see the User Guide at https://docs.aws.amazon.com/mediaconvert/latest/ug/tagging-resources.html // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about @@ -4225,6 +4225,13 @@ func (s *ContainerSettings) SetMp4Settings(v *Mp4Settings) *ContainerSettings { type CreateJobInput struct { _ struct{} `type:"structure"` + // Optional. Choose a tag type that AWS Billing and Cost Management will use + // to sort your AWS Elemental MediaConvert costs on any billing report that + // you set up. Any transcoding outputs that don't have an associated tag will + // appear in your billing report unsorted. If you don't choose a valid value + // for this field, your job outputs will appear on the billing report unsorted. + BillingTagsSource *string `locationName:"billingTagsSource" type:"string" enum:"BillingTagsSource"` + // Idempotency token for CreateJob operation. ClientRequestToken *string `locationName:"clientRequestToken" type:"string" idempotencyToken:"true"` @@ -4284,6 +4291,12 @@ func (s *CreateJobInput) Validate() error { return nil } +// SetBillingTagsSource sets the BillingTagsSource field's value. +func (s *CreateJobInput) SetBillingTagsSource(v string) *CreateJobInput { + s.BillingTagsSource = &v + return s +} + // SetClientRequestToken sets the ClientRequestToken field's value. func (s *CreateJobInput) SetClientRequestToken(v string) *CreateJobInput { s.ClientRequestToken = &v @@ -5052,6 +5065,12 @@ type DescribeEndpointsInput struct { // one time. MaxResults *int64 `locationName:"maxResults" type:"integer"` + // Optional field, defaults to DEFAULT. Specify DEFAULT for this operation to + // return your endpoints if any exist, or to create an endpoint for you and + // return it if one doesn't already exist. Specify GET_ONLY to return your endpoints + // if any exist, or an empty list if none exist. + Mode *string `locationName:"mode" type:"string" enum:"DescribeEndpointsMode"` + // Use this string, provided with the response to a previous request, to request // the next batch of endpoints. NextToken *string `locationName:"nextToken" type:"string"` @@ -5073,6 +5092,12 @@ func (s *DescribeEndpointsInput) SetMaxResults(v int64) *DescribeEndpointsInput return s } +// SetMode sets the Mode field's value. +func (s *DescribeEndpointsInput) SetMode(v string) *DescribeEndpointsInput { + s.Mode = &v + return s +} + // SetNextToken sets the NextToken field's value. func (s *DescribeEndpointsInput) SetNextToken(v string) *DescribeEndpointsInput { s.NextToken = &v @@ -5857,7 +5882,7 @@ func (s *EmbeddedSourceSettings) SetSource608TrackNumber(v int64) *EmbeddedSourc return s } -// Describes account specific API endpoint +// Describes an account-specific API endpoint. type Endpoint struct { _ struct{} `type:"structure"` @@ -8803,6 +8828,13 @@ type Job struct { // An identifier for this resource that is unique within all of AWS. Arn *string `locationName:"arn" type:"string"` + // Optional. Choose a tag type that AWS Billing and Cost Management will use + // to sort your AWS Elemental MediaConvert costs on any billing report that + // you set up. Any transcoding outputs that don't have an associated tag will + // appear in your billing report unsorted. If you don't choose a valid value + // for this field, your job outputs will appear on the billing report unsorted. + BillingTagsSource *string `locationName:"billingTagsSource" type:"string" enum:"BillingTagsSource"` + // The time, in Unix epoch format in seconds, when the job got created. CreatedAt *time.Time `locationName:"createdAt" type:"timestamp" timestampFormat:"unixTimestamp"` @@ -8867,6 +8899,12 @@ func (s *Job) SetArn(v string) *Job { return s } +// SetBillingTagsSource sets the BillingTagsSource field's value. +func (s *Job) SetBillingTagsSource(v string) *Job { + s.BillingTagsSource = &v + return s +} + // SetCreatedAt sets the CreatedAt field's value. func (s *Job) SetCreatedAt(v time.Time) *Job { s.CreatedAt = &v @@ -9390,7 +9428,7 @@ func (s *ListJobTemplatesInput) SetOrder(v string) *ListJobTemplatesInput { } // Successful list job templates requests return a JSON array of job templates. -// If you do not specify how they are ordered, you will receive them in alphabetical +// If you don't specify how they are ordered, you will receive them in alphabetical // order by name. type ListJobTemplatesOutput struct { _ struct{} `type:"structure"` @@ -9502,9 +9540,8 @@ func (s *ListJobsInput) SetStatus(v string) *ListJobsInput { return s } -// Successful list jobs requests return a JSON array of jobs. If you do not -// specify how they are ordered, you will receive the most recently created -// first. +// Successful list jobs requests return a JSON array of jobs. If you don't specify +// how they are ordered, you will receive the most recently created first. type ListJobsOutput struct { _ struct{} `type:"structure"` @@ -9618,9 +9655,8 @@ func (s *ListPresetsInput) SetOrder(v string) *ListPresetsInput { return s } -// Successful list presets requests return a JSON array of presets. If you do -// not specify how they are ordered, you will receive them alphabetically by -// name. +// Successful list presets requests return a JSON array of presets. If you don't +// specify how they are ordered, you will receive them alphabetically by name. type ListPresetsOutput struct { _ struct{} `type:"structure"` @@ -9722,7 +9758,7 @@ func (s *ListQueuesInput) SetOrder(v string) *ListQueuesInput { return s } -// Successful list queues return a JSON array of queues. If you do not specify +// Successful list queues return a JSON array of queues. If you don't specify // how they are ordered, you will receive them alphabetically by name. type ListQueuesOutput struct { _ struct{} `type:"structure"` @@ -12125,8 +12161,8 @@ type Queue struct { ProgressingJobsCount *int64 `locationName:"progressingJobsCount" type:"integer"` // Queues can be ACTIVE or PAUSED. If you pause a queue, jobs in that queue - // will not begin. Jobs running when a queue is paused continue to run until - // they finish or error out. + // won't begin. Jobs running when a queue is paused continue to run until they + // finish or error out. Status *string `locationName:"status" type:"string" enum:"QueueStatus"` // Estimated number of jobs in SUBMITTED status. @@ -12498,8 +12534,9 @@ func (s *StaticKeyProvider) SetUrl(v string) *StaticKeyProvider { return s } -// To tag a queue, preset, or job template, send a request with the tags and -// the Amazon Resource Name (ARN) of the resource that you want to tag. +// To add tags to a queue, preset, or job template, send a request with the +// Amazon Resource Name (ARN) of the resource and the tags that you want to +// add. type TagResourceInput struct { _ struct{} `type:"structure"` @@ -12554,7 +12591,7 @@ func (s *TagResourceInput) SetTags(v map[string]*string) *TagResourceInput { return s } -// Successful tag resource requests return an OK message. +// A successful request to add tags to a resource returns an OK message. type TagResourceOutput struct { _ struct{} `type:"structure"` } @@ -12893,7 +12930,9 @@ type UntagResourceInput struct { // The Amazon Resource Name (ARN) of the resource that you want to remove tags // from. To get the ARN, send a GET request with the resource name. - Arn *string `locationName:"arn" type:"string"` + // + // Arn is a required field + Arn *string `location:"uri" locationName:"arn" type:"string" required:"true"` // The keys of the tags that you want to remove from the resource. TagKeys []*string `locationName:"tagKeys" type:"list"` @@ -12909,6 +12948,19 @@ func (s UntagResourceInput) GoString() string { return s.String() } +// Validate inspects the fields of the type to determine if they are valid. +func (s *UntagResourceInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "UntagResourceInput"} + if s.Arn == nil { + invalidParams.Add(request.NewErrParamRequired("Arn")) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + // SetArn sets the Arn field's value. func (s *UntagResourceInput) SetArn(v string) *UntagResourceInput { s.Arn = &v @@ -12921,7 +12973,7 @@ func (s *UntagResourceInput) SetTagKeys(v []*string) *UntagResourceInput { return s } -// A successful request to remove a tag from a resource returns an OK message. +// A successful request to remove tags from a resource returns an OK message. type UntagResourceOutput struct { _ struct{} `type:"structure"` } @@ -13158,8 +13210,8 @@ type UpdateQueueInput struct { Name *string `location:"uri" locationName:"name" type:"string" required:"true"` // Queues can be ACTIVE or PAUSED. If you pause a queue, jobs in that queue - // will not begin. Jobs running when a queue is paused continue to run until - // they finish or error out. + // won't begin. Jobs running when a queue is paused continue to run until they + // finish or error out. Status *string `locationName:"status" type:"string" enum:"QueueStatus"` } @@ -14202,6 +14254,22 @@ const ( AudioTypeControlUseConfigured = "USE_CONFIGURED" ) +// Optional. Choose a tag type that AWS Billing and Cost Management will use +// to sort your AWS Elemental MediaConvert costs on any billing report that +// you set up. Any transcoding outputs that don't have an associated tag will +// appear in your billing report unsorted. If you don't choose a valid value +// for this field, your job outputs will appear on the billing report unsorted. +const ( + // BillingTagsSourceQueue is a BillingTagsSource enum value + BillingTagsSourceQueue = "QUEUE" + + // BillingTagsSourcePreset is a BillingTagsSource enum value + BillingTagsSourcePreset = "PRESET" + + // BillingTagsSourceJobTemplate is a BillingTagsSource enum value + BillingTagsSourceJobTemplate = "JOB_TEMPLATE" +) + // If no explicit x_position or y_position is provided, setting alignment to // centered will place the captions at the bottom center of the output. Similarly, // setting a left alignment will align captions to the bottom left of the output. @@ -14652,6 +14720,18 @@ const ( DeinterlacerModeAdaptive = "ADAPTIVE" ) +// Optional field, defaults to DEFAULT. Specify DEFAULT for this operation to +// return your endpoints if any exist, or to create an endpoint for you and +// return it if one doesn't already exist. Specify GET_ONLY to return your endpoints +// if any exist, or an empty list if none exist. +const ( + // DescribeEndpointsModeDefault is a DescribeEndpointsMode enum value + DescribeEndpointsModeDefault = "DEFAULT" + + // DescribeEndpointsModeGetOnly is a DescribeEndpointsMode enum value + DescribeEndpointsModeGetOnly = "GET_ONLY" +) + // Applies only to 29.97 fps outputs. When this feature is enabled, the service // will use drop-frame timecode on outputs. If it is not possible to use drop-frame // timecode, the system will fall back to non-drop-frame. This setting is enabled @@ -17281,8 +17361,8 @@ const ( ) // Queues can be ACTIVE or PAUSED. If you pause a queue, jobs in that queue -// will not begin. Jobs running when a queue is paused continue to run until -// they finish or error out. +// won't begin. Jobs running when a queue is paused continue to run until they +// finish or error out. const ( // QueueStatusActive is a QueueStatus enum value QueueStatusActive = "ACTIVE" diff --git a/vendor/github.com/aws/aws-sdk-go/service/mediapackage/api.go b/vendor/github.com/aws/aws-sdk-go/service/mediapackage/api.go index a0bac9a2f4e..935d8c8074a 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/mediapackage/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/mediapackage/api.go @@ -852,6 +852,8 @@ const opRotateChannelCredentials = "RotateChannelCredentials" // } // // See also, https://docs.aws.amazon.com/goto/WebAPI/mediapackage-2017-10-12/RotateChannelCredentials +// +// Deprecated: This API is deprecated. Please use RotateIngestEndpointCredentials instead func (c *MediaPackage) RotateChannelCredentialsRequest(input *RotateChannelCredentialsInput) (req *request.Request, output *RotateChannelCredentialsOutput) { if c.Client.Config.Logger != nil { c.Client.Config.Logger.Log("This operation, RotateChannelCredentials, has been deprecated") @@ -897,6 +899,8 @@ func (c *MediaPackage) RotateChannelCredentialsRequest(input *RotateChannelCrede // * ErrCodeTooManyRequestsException "TooManyRequestsException" // // See also, https://docs.aws.amazon.com/goto/WebAPI/mediapackage-2017-10-12/RotateChannelCredentials +// +// Deprecated: This API is deprecated. Please use RotateIngestEndpointCredentials instead func (c *MediaPackage) RotateChannelCredentials(input *RotateChannelCredentialsInput) (*RotateChannelCredentialsOutput, error) { req, out := c.RotateChannelCredentialsRequest(input) return out, req.Send() @@ -911,6 +915,8 @@ func (c *MediaPackage) RotateChannelCredentials(input *RotateChannelCredentialsI // the context is nil a panic will occur. In the future the SDK may create // sub-contexts for http.Requests. See https://golang.org/pkg/context/ // for more information on using Contexts. +// +// Deprecated: This API is deprecated. Please use RotateIngestEndpointCredentials instead func (c *MediaPackage) RotateChannelCredentialsWithContext(ctx aws.Context, input *RotateChannelCredentialsInput, opts ...request.Option) (*RotateChannelCredentialsOutput, error) { req, out := c.RotateChannelCredentialsRequest(input) req.SetContext(ctx) @@ -3201,6 +3207,7 @@ func (s *OriginEndpoint) SetWhitelist(v []*string) *OriginEndpoint { return s } +// Deprecated: RotateChannelCredentialsInput has been deprecated type RotateChannelCredentialsInput struct { _ struct{} `deprecated:"true" type:"structure"` @@ -3237,6 +3244,7 @@ func (s *RotateChannelCredentialsInput) SetId(v string) *RotateChannelCredential return s } +// Deprecated: RotateChannelCredentialsOutput has been deprecated type RotateChannelCredentialsOutput struct { _ struct{} `deprecated:"true" type:"structure"` diff --git a/vendor/github.com/aws/aws-sdk-go/service/neptune/api.go b/vendor/github.com/aws/aws-sdk-go/service/neptune/api.go index fc722da8e85..be502aa9094 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/neptune/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/neptune/api.go @@ -7551,6 +7551,8 @@ type CreateDBInstanceInput struct { PromotionTier *int64 `type:"integer"` // This parameter is not supported. + // + // Deprecated: PubliclyAccessible has been deprecated PubliclyAccessible *bool `deprecated:"true" type:"boolean"` // Specifies whether the DB instance is encrypted. @@ -9396,6 +9398,8 @@ type DBInstance struct { PromotionTier *int64 `type:"integer"` // This parameter is not supported. + // + // Deprecated: PubliclyAccessible has been deprecated PubliclyAccessible *bool `deprecated:"true" type:"boolean"` // Contains one or more identifiers of DB clusters that are Read Replicas of @@ -14089,6 +14093,8 @@ type ModifyDBInstanceInput struct { PromotionTier *int64 `type:"integer"` // This parameter is not supported. + // + // Deprecated: PubliclyAccessible has been deprecated PubliclyAccessible *bool `deprecated:"true" type:"boolean"` // Specifies the storage type to be associated with the DB instance. diff --git a/vendor/github.com/aws/aws-sdk-go/service/rds/api.go b/vendor/github.com/aws/aws-sdk-go/service/rds/api.go index 5b248fbd452..2b6787b3987 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/rds/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/rds/api.go @@ -60,8 +60,9 @@ func (c *RDS) AddRoleToDBClusterRequest(input *AddRoleToDBClusterInput) (req *re // AddRoleToDBCluster API operation for Amazon Relational Database Service. // // Associates an Identity and Access Management (IAM) role from an Aurora DB -// cluster. For more information, see Authorizing Amazon Aurora to Access Other -// AWS Services On Your Behalf (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/Aurora.Authorizing.AWSServices.html). +// cluster. For more information, see Authorizing Amazon Aurora MySQL to Access +// Other AWS Services on Your Behalf (http://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/AuroraMySQL.Integrating.Authorizing.html) +// in the Amazon Aurora User Guide. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about @@ -509,8 +510,8 @@ func (c *RDS) BacktrackDBClusterRequest(input *BacktrackDBClusterInput) (req *re // Backtracks a DB cluster to a specific time, without creating a new DB cluster. // // For more information on backtracking, see Backtracking an Aurora DB Cluster -// (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/AuroraMySQL.Managing.Backtrack.html) -// in the Amazon RDS User Guide. +// (http://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/AuroraMySQL.Managing.Backtrack.html) +// in the Amazon Aurora User Guide. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about @@ -735,12 +736,11 @@ func (c *RDS) CopyDBClusterSnapshotRequest(input *CopyDBClusterSnapshotInput) (r // DB cluster snapshot is in "copying" status. // // For more information on copying encrypted DB cluster snapshots from one AWS -// Region to another, see Copying a DB Cluster Snapshot in the Same Account, -// Either in the Same Region or Across Regions (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_CopySnapshot.html#USER_CopyDBClusterSnapshot.CrossRegion) -// in the Amazon RDS User Guide. +// Region to another, see Copying a Snapshot (http://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/USER_CopySnapshot.html) +// in the Amazon Aurora User Guide. // -// For more information on Amazon Aurora, see Aurora on Amazon RDS (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/CHAP_Aurora.html) -// in the Amazon RDS User Guide. +// For more information on Amazon Aurora, see What Is Amazon Aurora? (http://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/CHAP_AuroraOverview.html) +// in the Amazon Aurora User Guide. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about @@ -1111,8 +1111,8 @@ func (c *RDS) CreateDBClusterRequest(input *CreateDBClusterInput) (req *request. // For cross-region replication where the DB cluster identified by ReplicationSourceIdentifier // is encrypted, you must also specify the PreSignedUrl parameter. // -// For more information on Amazon Aurora, see Aurora on Amazon RDS (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/CHAP_Aurora.html) -// in the Amazon RDS User Guide. +// For more information on Amazon Aurora, see What Is Amazon Aurora? (http://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/CHAP_AuroraOverview.html) +// in the Amazon Aurora User Guide. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about @@ -1267,8 +1267,8 @@ func (c *RDS) CreateDBClusterParameterGroupRequest(input *CreateDBClusterParamet // command to verify that your DB cluster parameter group has been created or // modified. // -// For more information on Amazon Aurora, see Aurora on Amazon RDS (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/CHAP_Aurora.html) -// in the Amazon RDS User Guide. +// For more information on Amazon Aurora, see What Is Amazon Aurora? (http://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/CHAP_AuroraOverview.html) +// in the Amazon Aurora User Guide. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about @@ -1352,8 +1352,8 @@ func (c *RDS) CreateDBClusterSnapshotRequest(input *CreateDBClusterSnapshotInput // CreateDBClusterSnapshot API operation for Amazon Relational Database Service. // // Creates a snapshot of a DB cluster. For more information on Amazon Aurora, -// see Aurora on Amazon RDS (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/CHAP_Aurora.html) -// in the Amazon RDS User Guide. +// see What Is Amazon Aurora? (http://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/CHAP_AuroraOverview.html) +// in the Amazon Aurora User Guide. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about @@ -1588,7 +1588,8 @@ func (c *RDS) CreateDBInstanceReadReplicaRequest(input *CreateDBInstanceReadRepl // Creates a new DB instance that acts as a Read Replica for an existing source // DB instance. You can create a Read Replica for a DB instance running MySQL, // MariaDB, or PostgreSQL. For more information, see Working with PostgreSQL, -// MySQL, and MariaDB Read Replicas (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_ReadRepl.html). +// MySQL, and MariaDB Read Replicas (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_ReadRepl.html) +// in the Amazon RDS User Guide. // // Amazon Aurora doesn't support this action. You must call the CreateDBInstance // action to create a DB instance for an Aurora DB cluster. @@ -2313,7 +2314,7 @@ func (c *RDS) DeleteDBClusterRequest(input *DeleteDBClusterInput) (req *request. // and can't be recovered. Manual DB cluster snapshots of the specified DB cluster // are not deleted. // -// For more information on Amazon Aurora, see Aurora on Amazon RDS (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/CHAP_Aurora.html)in the Amazon RDS User Guide. +// For more information on Amazon Aurora, see What Is Amazon Aurora? (http://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/CHAP_AuroraOverview.html)in the Amazon Aurora User Guide. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about @@ -2409,8 +2410,8 @@ func (c *RDS) DeleteDBClusterParameterGroupRequest(input *DeleteDBClusterParamet // Deletes a specified DB cluster parameter group. The DB cluster parameter // group to be deleted can't be associated with any DB clusters. // -// For more information on Amazon Aurora, see Aurora on Amazon RDS (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/CHAP_Aurora.html) -// in the Amazon RDS User Guide. +// For more information on Amazon Aurora, see What Is Amazon Aurora? (http://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/CHAP_AuroraOverview.html) +// in the Amazon Aurora User Guide. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about @@ -2499,8 +2500,8 @@ func (c *RDS) DeleteDBClusterSnapshotRequest(input *DeleteDBClusterSnapshotInput // // The DB cluster snapshot must be in the available state to be deleted. // -// For more information on Amazon Aurora, see Aurora on Amazon RDS (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/CHAP_Aurora.html) -// in the Amazon RDS User Guide. +// For more information on Amazon Aurora, see What Is Amazon Aurora? (http://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/CHAP_AuroraOverview.html) +// in the Amazon Aurora User Guide. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about @@ -3371,8 +3372,8 @@ func (c *RDS) DescribeDBClusterBacktracksRequest(input *DescribeDBClusterBacktra // // Returns information about backtracks for a DB cluster. // -// For more information on Amazon Aurora, see Aurora on Amazon RDS (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/CHAP_Aurora.html) -// in the Amazon RDS User Guide. +// For more information on Amazon Aurora, see What Is Amazon Aurora? (http://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/CHAP_AuroraOverview.html) +// in the Amazon Aurora User Guide. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about @@ -3458,8 +3459,8 @@ func (c *RDS) DescribeDBClusterParameterGroupsRequest(input *DescribeDBClusterPa // parameter is specified, the list will contain only the description of the // specified DB cluster parameter group. // -// For more information on Amazon Aurora, see Aurora on Amazon RDS (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/CHAP_Aurora.html) -// in the Amazon RDS User Guide. +// For more information on Amazon Aurora, see What Is Amazon Aurora? (http://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/CHAP_AuroraOverview.html) +// in the Amazon Aurora User Guide. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about @@ -3541,8 +3542,8 @@ func (c *RDS) DescribeDBClusterParametersRequest(input *DescribeDBClusterParamet // Returns the detailed parameter list for a particular DB cluster parameter // group. // -// For more information on Amazon Aurora, see Aurora on Amazon RDS (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/CHAP_Aurora.html) -// in the Amazon RDS User Guide. +// For more information on Amazon Aurora, see What Is Amazon Aurora? (http://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/CHAP_AuroraOverview.html) +// in the Amazon Aurora User Guide. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about @@ -3714,8 +3715,8 @@ func (c *RDS) DescribeDBClusterSnapshotsRequest(input *DescribeDBClusterSnapshot // Returns information about DB cluster snapshots. This API action supports // pagination. // -// For more information on Amazon Aurora, see Aurora on Amazon RDS (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/CHAP_Aurora.html) -// in the Amazon RDS User Guide. +// For more information on Amazon Aurora, see What Is Amazon Aurora? (http://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/CHAP_AuroraOverview.html) +// in the Amazon Aurora User Guide. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about @@ -3803,8 +3804,8 @@ func (c *RDS) DescribeDBClustersRequest(input *DescribeDBClustersInput) (req *re // Returns information about provisioned Aurora DB clusters. This API supports // pagination. // -// For more information on Amazon Aurora, see Aurora on Amazon RDS (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/CHAP_Aurora.html) -// in the Amazon RDS User Guide. +// For more information on Amazon Aurora, see What Is Amazon Aurora? (http://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/CHAP_AuroraOverview.html) +// in the Amazon Aurora User Guide. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about @@ -5108,8 +5109,8 @@ func (c *RDS) DescribeEngineDefaultClusterParametersRequest(input *DescribeEngin // Returns the default engine and system parameter information for the cluster // database engine. // -// For more information on Amazon Aurora, see Aurora on Amazon RDS (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/CHAP_Aurora.html) -// in the Amazon RDS User Guide. +// For more information on Amazon Aurora, see What Is Amazon Aurora? (http://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/CHAP_AuroraOverview.html) +// in the Amazon Aurora User Guide. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about @@ -6720,8 +6721,8 @@ func (c *RDS) FailoverDBClusterRequest(input *FailoverDBClusterInput) (req *requ // re-establish any existing connections that use those endpoint addresses when // the failover is complete. // -// For more information on Amazon Aurora, see Aurora on Amazon RDS (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/CHAP_Aurora.html) -// in the Amazon RDS User Guide. +// For more information on Amazon Aurora, see What Is Amazon Aurora? (http://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/CHAP_AuroraOverview.html) +// in the Amazon Aurora User Guide. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about @@ -6809,7 +6810,8 @@ func (c *RDS) ListTagsForResourceRequest(input *ListTagsForResourceInput) (req * // Lists all tags on an Amazon RDS resource. // // For an overview on tagging an Amazon RDS resource, see Tagging Amazon RDS -// Resources (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/Overview.Tagging.html). +// Resources (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/Overview.Tagging.html) +// in the Amazon RDS User Guide. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about @@ -6906,14 +6908,14 @@ func (c *RDS) ModifyCurrentDBClusterCapacityRequest(input *ModifyCurrentDBCluste // cooldown period for scaling down. // // For more information about Aurora Serverless, see Using Amazon Aurora Serverless -// (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/aurora-serverless.html) -// in the Amazon RDS User Guide. +// (http://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/aurora-serverless.html) +// in the Amazon Aurora User Guide. // // If you call ModifyCurrentDBClusterCapacity with the default TimeoutAction, // connections that prevent Aurora Serverless from finding a scaling point might // be dropped. For more information about scaling points, see Autoscaling for -// Aurora Serverless (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/aurora-serverless.how-it-works.html#aurora-serverless.how-it-works.auto-scaling) -// in the Amazon RDS User Guide. +// Aurora Serverless (http://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/aurora-serverless.how-it-works.html#aurora-serverless.how-it-works.auto-scaling) +// in the Amazon Aurora User Guide. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about @@ -7001,9 +7003,9 @@ func (c *RDS) ModifyDBClusterRequest(input *ModifyDBClusterInput) (req *request. // // Modify a setting for an Amazon Aurora DB cluster. You can change one or more // database configuration parameters by specifying these parameters and the -// new values in the request. For more information on Amazon Aurora, see Aurora -// on Amazon RDS (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/CHAP_Aurora.html) -// in the Amazon RDS User Guide. +// new values in the request. For more information on Amazon Aurora, see What +// Is Amazon Aurora? (http://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/CHAP_AuroraOverview.html) +// in the Amazon Aurora User Guide. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about @@ -7120,8 +7122,8 @@ func (c *RDS) ModifyDBClusterParameterGroupRequest(input *ModifyDBClusterParamet // one parameter, submit a list of the following: ParameterName, ParameterValue, // and ApplyMethod. A maximum of 20 parameters can be modified in a single request. // -// For more information on Amazon Aurora, see Aurora on Amazon RDS (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/CHAP_Aurora.html) -// in the Amazon RDS User Guide. +// For more information on Amazon Aurora, see What Is Amazon Aurora? (http://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/CHAP_AuroraOverview.html) +// in the Amazon Aurora User Guide. // // Changes to dynamic parameters are applied immediately. Changes to static // parameters require a reboot without failover to the DB cluster associated @@ -8290,7 +8292,8 @@ func (c *RDS) RebootDBInstanceRequest(input *RebootDBInstanceInput) (req *reques // DB instance results in a momentary outage, during which the DB instance status // is set to rebooting. // -// For more information about rebooting, see Rebooting a DB Instance (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_RebootInstance.html). +// For more information about rebooting, see Rebooting a DB Instance (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_RebootInstance.html) +// in the Amazon RDS User Guide. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about @@ -8375,8 +8378,9 @@ func (c *RDS) RemoveRoleFromDBClusterRequest(input *RemoveRoleFromDBClusterInput // RemoveRoleFromDBCluster API operation for Amazon Relational Database Service. // // Disassociates an Identity and Access Management (IAM) role from an Aurora -// DB cluster. For more information, see Authorizing Amazon Aurora to Access -// Other AWS Services On Your Behalf (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/Aurora.Authorizing.AWSServices.html). +// DB cluster. For more information, see Authorizing Amazon Aurora MySQL to +// Access Other AWS Services on Your Behalf (http://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/AuroraMySQL.Integrating.Authorizing.html) +// in the Amazon Aurora User Guide. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about @@ -8549,7 +8553,8 @@ func (c *RDS) RemoveTagsFromResourceRequest(input *RemoveTagsFromResourceInput) // Removes metadata tags from an Amazon RDS resource. // // For an overview on tagging an Amazon RDS resource, see Tagging Amazon RDS -// Resources (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/Overview.Tagging.html). +// Resources (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/Overview.Tagging.html) +// in the Amazon RDS User Guide. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about @@ -8645,8 +8650,8 @@ func (c *RDS) ResetDBClusterParameterGroupRequest(input *ResetDBClusterParameter // for every DB instance in your DB cluster that you want the updated static // parameter to apply to. // -// For more information on Amazon Aurora, see Aurora on Amazon RDS (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/CHAP_Aurora.html) -// in the Amazon RDS User Guide. +// For more information on Amazon Aurora, see What Is Amazon Aurora? (http://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/CHAP_AuroraOverview.html) +// in the Amazon Aurora User Guide. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about @@ -8822,8 +8827,9 @@ func (c *RDS) RestoreDBClusterFromS3Request(input *RestoreDBClusterFromS3Input) // // Creates an Amazon Aurora DB cluster from data stored in an Amazon S3 bucket. // Amazon RDS must be authorized to access the Amazon S3 bucket and the data -// must be created using the Percona XtraBackup utility as described in Migrating -// Data from MySQL by Using an Amazon S3 Bucket (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/Aurora.Migrate.MySQL.html#Aurora.Migrate.MySQL.S3). +// must be created using the Percona XtraBackup utility as described in Migrating +// Data to an Amazon Aurora MySQL DB Cluster (http://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/AuroraMySQL.Migrating.html) +// in the Amazon Aurora User Guide. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about @@ -8957,8 +8963,8 @@ func (c *RDS) RestoreDBClusterFromSnapshotRequest(input *RestoreDBClusterFromSna // source DB cluster, except that the new DB cluster is created with the default // security group. // -// For more information on Amazon Aurora, see Aurora on Amazon RDS (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/CHAP_Aurora.html) -// in the Amazon RDS User Guide. +// For more information on Amazon Aurora, see What Is Amazon Aurora? (http://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/CHAP_AuroraOverview.html) +// in the Amazon Aurora User Guide. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about @@ -9109,8 +9115,8 @@ func (c *RDS) RestoreDBClusterToPointInTimeRequest(input *RestoreDBClusterToPoin // RestoreDBClusterToPointInTime action has completed and the DB cluster is // available. // -// For more information on Amazon Aurora, see Aurora on Amazon RDS (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/CHAP_Aurora.html) -// in the Amazon RDS User Guide. +// For more information on Amazon Aurora, see What Is Amazon Aurora? (http://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/CHAP_AuroraOverview.html) +// in the Amazon Aurora User Guide. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about @@ -9414,7 +9420,8 @@ func (c *RDS) RestoreDBInstanceFromS3Request(input *RestoreDBInstanceFromS3Input // database, store it on Amazon Simple Storage Service (Amazon S3), and then // restore the backup file onto a new Amazon RDS DB instance running MySQL. // For more information, see Importing Data into an Amazon RDS MySQL DB Instance -// (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/MySQL.Procedural.Importing.html). +// (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/MySQL.Procedural.Importing.html) +// in the Amazon RDS User Guide. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about @@ -10823,7 +10830,7 @@ func (s *CharacterSet) SetCharacterSetName(v string) *CharacterSet { // exported (or not exported) to CloudWatch Logs. The values within these arrays // depend on the DB engine being used. For more information, see Publishing // Database Logs to Amazon CloudWatch Logs (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_LogAccess.html#USER_LogAccess.Procedural.UploadtoCloudWatch) -// in the Amazon Relational Database Service User Guide. +// in the Amazon RDS User Guide. type CloudwatchLogsExportConfiguration struct { _ struct{} `type:"structure"` @@ -10860,8 +10867,9 @@ type CopyDBClusterParameterGroupInput struct { _ struct{} `type:"structure"` // The identifier or Amazon Resource Name (ARN) for the source DB cluster parameter - // group. For information about creating an ARN, see Constructing an RDS Amazon - // Resource Name (ARN) (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_Tagging.ARN.html#USER_Tagging.ARN.Constructing). + // group. For information about creating an ARN, see Constructing an ARN for + // Amazon RDS (http://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/USER_Tagging.ARN.html#USER_Tagging.ARN.Constructing) + // in the Amazon Aurora User Guide. // // Constraints: // @@ -10877,7 +10885,8 @@ type CopyDBClusterParameterGroupInput struct { // SourceDBClusterParameterGroupIdentifier is a required field SourceDBClusterParameterGroupIdentifier *string `type:"string" required:"true"` - // A list of tags. For more information, see Tagging Amazon RDS Resources (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_Tagging.html). + // A list of tags. For more information, see Tagging Amazon RDS Resources (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_Tagging.html) + // in the Amazon RDS User Guide. Tags []*Tag `locationNameList:"Tag" type:"list"` // A description for the copied DB cluster parameter group. @@ -11060,7 +11069,8 @@ type CopyDBClusterSnapshotInput struct { // // * If the source snapshot is in a different AWS Region than the copy, specify // a valid DB cluster snapshot ARN. For more information, go to Copying - // a DB Snapshot or DB Cluster Snapshot (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_CopySnapshot.html). + // Snapshots Across AWS Regions (http://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/USER_CopySnapshot.html#USER_CopySnapshot.AcrossRegions) + // in the Amazon Aurora User Guide. // // Example: my-cluster-snapshot1 // @@ -11072,7 +11082,8 @@ type CopyDBClusterSnapshotInput struct { // have the same region as the source ARN. SourceRegion *string `type:"string" ignore:"true"` - // A list of tags. For more information, see Tagging Amazon RDS Resources (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_Tagging.html). + // A list of tags. For more information, see Tagging Amazon RDS Resources (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_Tagging.html) + // in the Amazon RDS User Guide. Tags []*Tag `locationNameList:"Tag" type:"list"` // The identifier of the new DB cluster snapshot to create from the source DB @@ -11196,8 +11207,8 @@ type CopyDBParameterGroupInput struct { _ struct{} `type:"structure"` // The identifier or ARN for the source DB parameter group. For information - // about creating an ARN, see Constructing an RDS Amazon Resource Name (ARN) - // (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_Tagging.ARN.html#USER_Tagging.ARN.Constructing). + // about creating an ARN, see Constructing an ARN for Amazon RDS (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_Tagging.ARN.html#USER_Tagging.ARN.Constructing) + // in the Amazon RDS User Guide. // // Constraints: // @@ -11209,7 +11220,8 @@ type CopyDBParameterGroupInput struct { // SourceDBParameterGroupIdentifier is a required field SourceDBParameterGroupIdentifier *string `type:"string" required:"true"` - // A list of tags. For more information, see Tagging Amazon RDS Resources (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_Tagging.html). + // A list of tags. For more information, see Tagging Amazon RDS Resources (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_Tagging.html) + // in the Amazon RDS User Guide. Tags []*Tag `locationNameList:"Tag" type:"list"` // A description for the copied DB parameter group. @@ -11351,7 +11363,8 @@ type CopyDBSnapshotInput struct { // another, and your DB instance uses a nondefault option group. If your source // DB instance uses Transparent Data Encryption for Oracle or Microsoft SQL // Server, you must specify this option when copying across AWS Regions. For - // more information, see Option Group Considerations (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_CopySnapshot.html#USER_CopySnapshot.Options). + // more information, see Option Group Considerations (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_CopySnapshot.html#USER_CopySnapshot.Options) + // in the Amazon RDS User Guide. OptionGroupName *string `type:"string"` // The URL that contains a Signature Version 4 signed request for the CopyDBSnapshot @@ -11428,7 +11441,8 @@ type CopyDBSnapshotInput struct { // have the same region as the source ARN. SourceRegion *string `type:"string" ignore:"true"` - // A list of tags. For more information, see Tagging Amazon RDS Resources (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_Tagging.html). + // A list of tags. For more information, see Tagging Amazon RDS Resources (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_Tagging.html) + // in the Amazon RDS User Guide. Tags []*Tag `locationNameList:"Tag" type:"list"` // The identifier for the copy of the snapshot. @@ -11558,7 +11572,8 @@ type CopyOptionGroupInput struct { _ struct{} `type:"structure"` // The identifier or ARN for the source option group. For information about - // creating an ARN, see Constructing an RDS Amazon Resource Name (ARN) (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_Tagging.ARN.html#USER_Tagging.ARN.Constructing). + // creating an ARN, see Constructing an ARN for Amazon RDS (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_Tagging.ARN.html#USER_Tagging.ARN.Constructing) + // in the Amazon RDS User Guide. // // Constraints: // @@ -11574,7 +11589,8 @@ type CopyOptionGroupInput struct { // SourceOptionGroupIdentifier is a required field SourceOptionGroupIdentifier *string `type:"string" required:"true"` - // A list of tags. For more information, see Tagging Amazon RDS Resources (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_Tagging.html). + // A list of tags. For more information, see Tagging Amazon RDS Resources (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_Tagging.html) + // in the Amazon RDS User Guide. Tags []*Tag `locationNameList:"Tag" type:"list"` // The description for the copied option group. @@ -11679,8 +11695,9 @@ type CreateDBClusterInput struct { _ struct{} `type:"structure"` // A list of EC2 Availability Zones that instances in the DB cluster can be - // created in. For information on AWS Regions and Availability Zones, see Regions - // and Availability Zones (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/Concepts.RegionsAndAvailabilityZones.html). + // created in. For information on AWS Regions and Availability Zones, see Choosing + // the Regions and Availability Zones (http://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/Concepts.RegionsAndAvailabilityZones.html) + // in the Amazon Aurora User Guide. AvailabilityZones []*string `locationNameList:"AvailabilityZone" type:"list"` // The target backtrack window, in seconds. To disable backtracking, set this @@ -11749,8 +11766,8 @@ type CreateDBClusterInput struct { // The list of log types that need to be enabled for exporting to CloudWatch // Logs. The values in the list depend on the DB engine being used. For more - // information, see Publishing Database Logs to Amazon CloudWatch Logs (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_LogAccess.html#USER_LogAccess.Procedural.UploadtoCloudWatch) - // in the Amazon Relational Database Service User Guide. + // information, see Publishing Database Logs to Amazon CloudWatch Logs (http://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/USER_LogAccess.html#USER_LogAccess.Procedural.UploadtoCloudWatch) + // in the Amazon Aurora User Guide. EnableCloudwatchLogsExports []*string `type:"list"` // True to enable mapping of AWS Identity and Access Management (IAM) accounts @@ -11870,8 +11887,8 @@ type CreateDBClusterInput struct { // // The default is a 30-minute window selected at random from an 8-hour block // of time for each AWS Region. To see the time blocks available, see Adjusting - // the Preferred Maintenance Window (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/AdjustingTheMaintenanceWindow.html) - // in the Amazon RDS User Guide. + // the Preferred DB Cluster Maintenance Window (http://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/USER_UpgradeDBInstance.Maintenance.html#AdjustingTheMaintenanceWindow.Aurora) + // in the Amazon Aurora User Guide. // // Constraints: // @@ -11891,9 +11908,9 @@ type CreateDBClusterInput struct { // // The default is a 30-minute window selected at random from an 8-hour block // of time for each AWS Region, occurring on a random day of the week. To see - // the time blocks available, see Adjusting the Preferred Maintenance Window - // (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/AdjustingTheMaintenanceWindow.html) - // in the Amazon RDS User Guide. + // the time blocks available, see Adjusting the Preferred DB Cluster Maintenance + // Window (http://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/USER_UpgradeDBInstance.Maintenance.html#AdjustingTheMaintenanceWindow.Aurora) + // in the Amazon Aurora User Guide. // // Valid Days: Mon, Tue, Wed, Thu, Fri, Sat, Sun. // @@ -11916,7 +11933,8 @@ type CreateDBClusterInput struct { // Specifies whether the DB cluster is encrypted. StorageEncrypted *bool `type:"boolean"` - // A list of tags. For more information, see Tagging Amazon RDS Resources (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_Tagging.html). + // A list of tags. For more information, see Tagging Amazon RDS Resources (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_Tagging.html) + // in the Amazon RDS User Guide. Tags []*Tag `locationNameList:"Tag" type:"list"` // A list of EC2 VPC security groups to associate with this DB cluster. @@ -12177,7 +12195,8 @@ type CreateDBClusterParameterGroupInput struct { // Description is a required field Description *string `type:"string" required:"true"` - // A list of tags. For more information, see Tagging Amazon RDS Resources (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_Tagging.html). + // A list of tags. For more information, see Tagging Amazon RDS Resources (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_Tagging.html) + // in the Amazon RDS User Guide. Tags []*Tag `locationNameList:"Tag" type:"list"` } @@ -12734,7 +12753,8 @@ type CreateDBInstanceInput struct { // The amount of Provisioned IOPS (input/output operations per second) to be // initially allocated for the DB instance. For information about valid Iops // values, see see Amazon RDS Provisioned IOPS Storage to Improve Performance - // (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/CHAP_Storage.html#USER_PIOPS). + // (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/CHAP_Storage.html#USER_PIOPS) + // in the Amazon RDS User Guide. // // Constraints: Must be a multiple between 1 and 50 of the storage amount for // the DB instance. Must also be an integer multiple of 1000. For example, if @@ -12873,7 +12893,8 @@ type CreateDBInstanceInput struct { // The ARN for the IAM role that permits RDS to send enhanced monitoring metrics // to Amazon CloudWatch Logs. For example, arn:aws:iam:123456789012:role/emaccess. // For information on creating a monitoring role, go to Setting Up and Enabling - // Enhanced Monitoring (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_Monitoring.OS.html#USER_Monitoring.OS.Enabling). + // Enhanced Monitoring (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_Monitoring.OS.html#USER_Monitoring.OS.Enabling) + // in the Amazon RDS User Guide. // // If MonitoringInterval is set to a value other than 0, then you must supply // a MonitoringRoleArn value. @@ -12950,7 +12971,8 @@ type CreateDBInstanceInput struct { // The daily time range during which automated backups are created if automated // backups are enabled, using the BackupRetentionPeriod parameter. For more - // information, see The Backup Window (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_WorkingWithAutomatedBackups.html#USER_WorkingWithAutomatedBackups.BackupWindow). + // information, see The Backup Window (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_WorkingWithAutomatedBackups.html#USER_WorkingWithAutomatedBackups.BackupWindow) + // in the Amazon RDS User Guide. // // Amazon Aurora // @@ -12959,7 +12981,8 @@ type CreateDBInstanceInput struct { // // The default is a 30-minute window selected at random from an 8-hour block // of time for each AWS Region. To see the time blocks available, see Adjusting - // the Preferred DB Instance Maintenance Window (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_UpgradeDBInstance.Maintenance.html#AdjustingTheMaintenanceWindow). + // the Preferred DB Instance Maintenance Window (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_UpgradeDBInstance.Maintenance.html#AdjustingTheMaintenanceWindow) + // in the Amazon RDS User Guide. // // Constraints: // @@ -12992,7 +13015,8 @@ type CreateDBInstanceInput struct { // A value that specifies the order in which an Aurora Replica is promoted to // the primary instance after a failure of the existing primary instance. For - // more information, see Fault Tolerance for an Aurora DB Cluster (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/Aurora.Managing.html#Aurora.Managing.FaultTolerance). + // more information, see Fault Tolerance for an Aurora DB Cluster (http://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/Aurora.Managing.Backups.html#Aurora.Managing.FaultTolerance) + // in the Amazon Aurora User Guide. // // Default: 1 // @@ -13045,7 +13069,8 @@ type CreateDBInstanceInput struct { // Default: io1 if the Iops parameter is specified, otherwise standard StorageType *string `type:"string"` - // A list of tags. For more information, see Tagging Amazon RDS Resources (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_Tagging.html). + // A list of tags. For more information, see Tagging Amazon RDS Resources (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_Tagging.html) + // in the Amazon RDS User Guide. Tags []*Tag `locationNameList:"Tag" type:"list"` // The ARN from the key store with which to associate the instance for TDE encryption. @@ -13457,7 +13482,7 @@ type CreateDBInstanceReadReplicaInput struct { // The list of logs that the new DB instance is to export to CloudWatch Logs. // The values in the list depend on the DB engine being used. For more information, // see Publishing Database Logs to Amazon CloudWatch Logs (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_LogAccess.html#USER_LogAccess.Procedural.UploadtoCloudWatch) - // in the Amazon Relational Database Service User Guide. + // in the Amazon RDS User Guide. EnableCloudwatchLogsExports []*string `type:"list"` // True to enable mapping of AWS Identity and Access Management (IAM) accounts @@ -13477,7 +13502,7 @@ type CreateDBInstanceReadReplicaInput struct { // True to enable Performance Insights for the read replica, and otherwise false. // // For more information, see Using Amazon Performance Insights (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_PerfInsights.html) - // in the Amazon Relational Database Service User Guide. + // in the Amazon RDS User Guide. EnablePerformanceInsights *bool `type:"boolean"` // The amount of Provisioned IOPS (input/output operations per second) to be @@ -13514,7 +13539,8 @@ type CreateDBInstanceReadReplicaInput struct { // The ARN for the IAM role that permits RDS to send enhanced monitoring metrics // to Amazon CloudWatch Logs. For example, arn:aws:iam:123456789012:role/emaccess. // For information on creating a monitoring role, go to To create an IAM role - // for Amazon RDS Enhanced Monitoring (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_Monitoring.html#USER_Monitoring.OS.IAMRole). + // for Amazon RDS Enhanced Monitoring (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_Monitoring.html#USER_Monitoring.OS.IAMRole) + // in the Amazon RDS User Guide. // // If MonitoringInterval is set to a value other than 0, then you must supply // a MonitoringRoleArn value. @@ -13625,7 +13651,8 @@ type CreateDBInstanceReadReplicaInput struct { // // * If the source DB instance is in a different AWS Region than the Read // Replica, specify a valid DB instance ARN. For more information, go to - // Constructing a Amazon RDS Amazon Resource Name (ARN) (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_Tagging.ARN.html#USER_Tagging.ARN.Constructing). + // Constructing an ARN for Amazon RDS (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_Tagging.ARN.html#USER_Tagging.ARN.Constructing) + // in the Amazon RDS User Guide. // // SourceDBInstanceIdentifier is a required field SourceDBInstanceIdentifier *string `type:"string" required:"true"` @@ -13644,7 +13671,8 @@ type CreateDBInstanceReadReplicaInput struct { // Default: io1 if the Iops parameter is specified, otherwise standard StorageType *string `type:"string"` - // A list of tags. For more information, see Tagging Amazon RDS Resources (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_Tagging.html). + // A list of tags. For more information, see Tagging Amazon RDS Resources (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_Tagging.html) + // in the Amazon RDS User Guide. Tags []*Tag `locationNameList:"Tag" type:"list"` // A value that specifies that the DB instance class of the DB instance uses @@ -13903,7 +13931,8 @@ type CreateDBParameterGroupInput struct { // Description is a required field Description *string `type:"string" required:"true"` - // A list of tags. For more information, see Tagging Amazon RDS Resources (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_Tagging.html). + // A list of tags. For more information, see Tagging Amazon RDS Resources (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_Tagging.html) + // in the Amazon RDS User Guide. Tags []*Tag `locationNameList:"Tag" type:"list"` } @@ -14011,7 +14040,8 @@ type CreateDBSecurityGroupInput struct { // DBSecurityGroupName is a required field DBSecurityGroupName *string `type:"string" required:"true"` - // A list of tags. For more information, see Tagging Amazon RDS Resources (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_Tagging.html). + // A list of tags. For more information, see Tagging Amazon RDS Resources (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_Tagging.html) + // in the Amazon RDS User Guide. Tags []*Tag `locationNameList:"Tag" type:"list"` } @@ -14114,7 +14144,8 @@ type CreateDBSnapshotInput struct { // DBSnapshotIdentifier is a required field DBSnapshotIdentifier *string `type:"string" required:"true"` - // A list of tags. For more information, see Tagging Amazon RDS Resources (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_Tagging.html). + // A list of tags. For more information, see Tagging Amazon RDS Resources (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_Tagging.html) + // in the Amazon RDS User Guide. Tags []*Tag `locationNameList:"Tag" type:"list"` } @@ -14210,7 +14241,8 @@ type CreateDBSubnetGroupInput struct { // SubnetIds is a required field SubnetIds []*string `locationNameList:"SubnetIdentifier" type:"list" required:"true"` - // A list of tags. For more information, see Tagging Amazon RDS Resources (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_Tagging.html). + // A list of tags. For more information, see Tagging Amazon RDS Resources (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_Tagging.html) + // in the Amazon RDS User Guide. Tags []*Tag `locationNameList:"Tag" type:"list"` } @@ -14351,7 +14383,8 @@ type CreateEventSubscriptionInput struct { // SubscriptionName is a required field SubscriptionName *string `type:"string" required:"true"` - // A list of tags. For more information, see Tagging Amazon RDS Resources (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_Tagging.html). + // A list of tags. For more information, see Tagging Amazon RDS Resources (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_Tagging.html) + // in the Amazon RDS User Guide. Tags []*Tag `locationNameList:"Tag" type:"list"` } @@ -14482,7 +14515,8 @@ type CreateOptionGroupInput struct { // OptionGroupName is a required field OptionGroupName *string `type:"string" required:"true"` - // A list of tags. For more information, see Tagging Amazon RDS Resources (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_Tagging.html). + // A list of tags. For more information, see Tagging Amazon RDS Resources (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_Tagging.html) + // in the Amazon RDS User Guide. Tags []*Tag `locationNameList:"Tag" type:"list"` } @@ -14656,8 +14690,8 @@ type DBCluster struct { // Logs. // // Log types vary by DB engine. For information about the log types for each - // DB engine, see Amazon RDS Database Log Files (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_LogAccess.html) - // in the Amazon RDS User Guide. + // DB engine, see Amazon RDS Database Log Files (http://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/USER_LogAccess.html) + // in the Amazon Aurora User Guide. EnabledCloudwatchLogsExports []*string `type:"list"` // Specifies the connection endpoint for the primary instance of the DB cluster. @@ -14731,8 +14765,8 @@ type DBCluster struct { // Shows the scaling configuration for an Aurora DB cluster in serverless DB // engine mode. // - // For more information, see Using Amazon Aurora Serverless (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/aurora-serverless.html) - // in the Amazon RDS User Guide. + // For more information, see Using Amazon Aurora Serverless (http://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/aurora-serverless.html) + // in the Amazon Aurora User Guide. ScalingConfigurationInfo *ScalingConfigurationInfo `type:"structure"` // Specifies the current state of this DB cluster. @@ -15024,7 +15058,8 @@ type DBClusterMember struct { // A value that specifies the order in which an Aurora Replica is promoted to // the primary instance after a failure of the existing primary instance. For - // more information, see Fault Tolerance for an Aurora DB Cluster (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/Aurora.Managing.html#Aurora.Managing.FaultTolerance). + // more information, see Fault Tolerance for an Aurora DB Cluster (http://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/Aurora.Managing.Backups.html#Aurora.Managing.FaultTolerance) + // in the Amazon Aurora User Guide. PromotionTier *int64 `type:"integer"` } @@ -15855,7 +15890,8 @@ type DBInstance struct { // A value that specifies the order in which an Aurora Replica is promoted to // the primary instance after a failure of the existing primary instance. For - // more information, see Fault Tolerance for an Aurora DB Cluster (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/Aurora.Managing.html#Aurora.Managing.FaultTolerance). + // more information, see Fault Tolerance for an Aurora DB Cluster (http://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/Aurora.Managing.Backups.html#Aurora.Managing.FaultTolerance) + // in the Amazon Aurora User Guide. PromotionTier *int64 `type:"integer"` // Specifies the accessibility options for the DB instance. A value of true @@ -15864,8 +15900,11 @@ type DBInstance struct { // instance with a DNS name that resolves to a private IP address. PubliclyAccessible *bool `type:"boolean"` - // Contains one or more identifiers of Aurora DB clusters that are Read Replicas - // of this DB instance. + // Contains one or more identifiers of Aurora DB clusters to which the RDS DB + // instance is replicated as a Read Replica. For example, when you create an + // Aurora Read Replica of an RDS MySQL DB instance, the Aurora MySQL DB cluster + // for the Aurora Read Replica is shown. This output does not contain information + // about cross region Aurora Read Replicas. ReadReplicaDBClusterIdentifiers []*string `locationNameList:"ReadReplicaDBClusterIdentifier" type:"list"` // Contains one or more identifiers of the Read Replicas associated with this @@ -22323,8 +22362,9 @@ type ListTagsForResourceInput struct { Filters []*Filter `locationNameList:"Filter" type:"list"` // The Amazon RDS resource with tags to be listed. This value is an Amazon Resource - // Name (ARN). For information about creating an ARN, see Constructing an RDS - // Amazon Resource Name (ARN) (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_Tagging.ARN.html#USER_Tagging.ARN.Constructing). + // Name (ARN). For information about creating an ARN, see Constructing an ARN + // for Amazon RDS (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_Tagging.ARN.html#USER_Tagging.ARN.Constructing) + // in the Amazon RDS User Guide. // // ResourceName is a required field ResourceName *string `type:"string" required:"true"` @@ -22554,12 +22594,12 @@ type ModifyDBClusterInput struct { // is set to false, changes to the DB cluster are applied during the next maintenance // window. // - // The ApplyImmediately parameter only affects the NewDBClusterIdentifier and - // MasterUserPassword values. If you set the ApplyImmediately parameter value - // to false, then changes to the NewDBClusterIdentifier and MasterUserPassword - // values are applied during the next maintenance window. All other changes - // are applied immediately, regardless of the value of the ApplyImmediately - // parameter. + // The ApplyImmediately parameter only affects the EnableIAMDatabaseAuthentication, + // MasterUserPassword, and NewDBClusterIdentifier values. If you set the ApplyImmediately + // parameter value to false, then changes to the EnableIAMDatabaseAuthentication, + // MasterUserPassword, and NewDBClusterIdentifier values are applied during + // the next maintenance window. All other changes are applied immediately, regardless + // of the value of the ApplyImmediately parameter. // // Default: false ApplyImmediately *bool `type:"boolean"` @@ -22659,8 +22699,8 @@ type ModifyDBClusterInput struct { // // The default is a 30-minute window selected at random from an 8-hour block // of time for each AWS Region. To see the time blocks available, see Adjusting - // the Preferred Maintenance Window (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/AdjustingTheMaintenanceWindow.html) - // in the Amazon RDS User Guide. + // the Preferred DB Cluster Maintenance Window (http://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/USER_UpgradeDBInstance.Maintenance.html#AdjustingTheMaintenanceWindow.Aurora) + // in the Amazon Aurora User Guide. // // Constraints: // @@ -22680,9 +22720,9 @@ type ModifyDBClusterInput struct { // // The default is a 30-minute window selected at random from an 8-hour block // of time for each AWS Region, occurring on a random day of the week. To see - // the time blocks available, see Adjusting the Preferred Maintenance Window - // (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/AdjustingTheMaintenanceWindow.html) - // in the Amazon RDS User Guide. + // the time blocks available, see Adjusting the Preferred DB Cluster Maintenance + // Window (http://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/USER_UpgradeDBInstance.Maintenance.html#AdjustingTheMaintenanceWindow.Aurora) + // in the Amazon Aurora User Guide. // // Valid Days: Mon, Tue, Wed, Thu, Fri, Sat, Sun. // @@ -23040,8 +23080,9 @@ type ModifyDBInstanceInput struct { // and are applied on the next call to RebootDBInstance, or the next failure // reboot. Review the table of parameters in Modifying a DB Instance and Using // the Apply Immediately Parameter (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/Overview.DBInstance.Modifying.html) - // to see the impact that setting ApplyImmediately to true or false has for - // each modified parameter and to determine when the changes are applied. + // in the Amazon RDS User Guide. to see the impact that setting ApplyImmediately + // to true or false has for each modified parameter and to determine when the + // changes are applied. // // Default: false ApplyImmediately *bool `type:"boolean"` @@ -23191,7 +23232,8 @@ type ModifyDBInstanceInput struct { // The new DB subnet group for the DB instance. You can use this parameter to // move your DB instance to a different VPC. If your DB instance is not in a // VPC, you can also use this parameter to move your DB instance into a VPC. - // For more information, see Updating the VPC for a DB Instance (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_VPC.WorkingWithRDSInstanceinaVPC.html#USER_VPC.Non-VPC2VPC). + // For more information, see Updating the VPC for a DB Instance (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_VPC.WorkingWithRDSInstanceinaVPC.html#USER_VPC.Non-VPC2VPC) + // in the Amazon RDS User Guide. // // Changing the subnet group causes an outage during the change. The change // is applied during the next maintenance window, unless you specify true for @@ -23336,7 +23378,8 @@ type ModifyDBInstanceInput struct { // The ARN for the IAM role that permits RDS to send enhanced monitoring metrics // to Amazon CloudWatch Logs. For example, arn:aws:iam:123456789012:role/emaccess. // For information on creating a monitoring role, go to To create an IAM role - // for Amazon RDS Enhanced Monitoring (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_Monitoring.html#USER_Monitoring.OS.IAMRole). + // for Amazon RDS Enhanced Monitoring (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_Monitoring.html#USER_Monitoring.OS.IAMRole) + // in the Amazon RDS User Guide. // // If MonitoringInterval is set to a value other than 0, then you must supply // a MonitoringRoleArn value. @@ -23431,7 +23474,8 @@ type ModifyDBInstanceInput struct { // A value that specifies the order in which an Aurora Replica is promoted to // the primary instance after a failure of the existing primary instance. For - // more information, see Fault Tolerance for an Aurora DB Cluster (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/Aurora.Managing.html#Aurora.Managing.FaultTolerance). + // more information, see Fault Tolerance for an Aurora DB Cluster (http://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/Aurora.Managing.Backups.html#Aurora.Managing.FaultTolerance) + // in the Amazon Aurora User Guide. // // Default: 1 // @@ -23994,7 +24038,8 @@ type ModifyDBSnapshotInput struct { // You can specify this parameter when you upgrade an Oracle DB snapshot. The // same option group considerations apply when upgrading a DB snapshot as when // upgrading a DB instance. For more information, see Option Group Considerations - // (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_UpgradeDBInstance.Oracle.html#USER_UpgradeDBInstance.Oracle.OGPG.OG). + // (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_UpgradeDBInstance.Oracle.html#USER_UpgradeDBInstance.Oracle.OGPG.OG) + // in the Amazon RDS User Guide. OptionGroupName *string `type:"string"` } @@ -25931,7 +25976,8 @@ type PurchaseReservedDBInstancesOfferingInput struct { // ReservedDBInstancesOfferingId is a required field ReservedDBInstancesOfferingId *string `type:"string" required:"true"` - // A list of tags. For more information, see Tagging Amazon RDS Resources (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_Tagging.html). + // A list of tags. For more information, see Tagging Amazon RDS Resources (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_Tagging.html) + // in the Amazon RDS User Guide. Tags []*Tag `locationNameList:"Tag" type:"list"` } @@ -26314,7 +26360,8 @@ type RemoveTagsFromResourceInput struct { // The Amazon RDS resource that the tags are removed from. This value is an // Amazon Resource Name (ARN). For information about creating an ARN, see Constructing - // an RDS Amazon Resource Name (ARN) (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_Tagging.ARN.html#USER_Tagging.ARN.Constructing). + // an ARN for Amazon RDS (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_Tagging.ARN.html#USER_Tagging.ARN.Constructing) + // in the Amazon RDS User Guide. // // ResourceName is a required field ResourceName *string `type:"string" required:"true"` @@ -26882,8 +26929,8 @@ type RestoreDBClusterFromS3Input struct { // The list of logs that the restored DB cluster is to export to CloudWatch // Logs. The values in the list depend on the DB engine being used. For more - // information, see Publishing Database Logs to Amazon CloudWatch Logs (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_LogAccess.html#USER_LogAccess.Procedural.UploadtoCloudWatch) - // in the Amazon Relational Database Service User Guide. + // information, see Publishing Database Logs to Amazon CloudWatch Logs (http://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/USER_LogAccess.html#USER_LogAccess.Procedural.UploadtoCloudWatch) + // in the Amazon Aurora User Guide. EnableCloudwatchLogsExports []*string `type:"list"` // True to enable mapping of AWS Identity and Access Management (IAM) accounts @@ -26962,8 +27009,8 @@ type RestoreDBClusterFromS3Input struct { // // The default is a 30-minute window selected at random from an 8-hour block // of time for each AWS Region. To see the time blocks available, see Adjusting - // the Preferred Maintenance Window (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/AdjustingTheMaintenanceWindow.html) - // in the Amazon RDS User Guide. + // the Preferred Maintenance Window (http://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/USER_UpgradeDBInstance.Maintenance.html#AdjustingTheMaintenanceWindow.Aurora) + // in the Amazon Aurora User Guide. // // Constraints: // @@ -26984,8 +27031,8 @@ type RestoreDBClusterFromS3Input struct { // The default is a 30-minute window selected at random from an 8-hour block // of time for each AWS Region, occurring on a random day of the week. To see // the time blocks available, see Adjusting the Preferred Maintenance Window - // (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/AdjustingTheMaintenanceWindow.html) - // in the Amazon RDS User Guide. + // (http://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/USER_UpgradeDBInstance.Maintenance.html#AdjustingTheMaintenanceWindow.Aurora) + // in the Amazon Aurora User Guide. // // Valid Days: Mon, Tue, Wed, Thu, Fri, Sat, Sun. // @@ -27031,7 +27078,8 @@ type RestoreDBClusterFromS3Input struct { // Specifies whether the restored DB cluster is encrypted. StorageEncrypted *bool `type:"boolean"` - // A list of tags. For more information, see Tagging Amazon RDS Resources (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_Tagging.html). + // A list of tags. For more information, see Tagging Amazon RDS Resources (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_Tagging.html) + // in the Amazon RDS User Guide. Tags []*Tag `locationNameList:"Tag" type:"list"` // A list of EC2 VPC security groups to associate with the restored DB cluster. @@ -27315,8 +27363,8 @@ type RestoreDBClusterFromSnapshotInput struct { // The list of logs that the restored DB cluster is to export to CloudWatch // Logs. The values in the list depend on the DB engine being used. For more - // information, see Publishing Database Logs to Amazon CloudWatch Logs (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_LogAccess.html#USER_LogAccess.Procedural.UploadtoCloudWatch) - // in the Amazon Relational Database Service User Guide. + // information, see Publishing Database Logs to Amazon CloudWatch Logs (http://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/USER_LogAccess.html#USER_LogAccess.Procedural.UploadtoCloudWatch) + // in the Amazon Aurora User Guide. EnableCloudwatchLogsExports []*string `type:"list"` // True to enable mapping of AWS Identity and Access Management (IAM) accounts @@ -27585,8 +27633,8 @@ type RestoreDBClusterToPointInTimeInput struct { // The list of logs that the restored DB cluster is to export to CloudWatch // Logs. The values in the list depend on the DB engine being used. For more - // information, see Publishing Database Logs to Amazon CloudWatch Logs (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_LogAccess.html#USER_LogAccess.Procedural.UploadtoCloudWatch) - // in the Amazon Relational Database Service User Guide. + // information, see Publishing Database Logs to Amazon CloudWatch Logs (http://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/USER_LogAccess.html#USER_LogAccess.Procedural.UploadtoCloudWatch) + // in the Amazon Aurora User Guide. EnableCloudwatchLogsExports []*string `type:"list"` // True to enable mapping of AWS Identity and Access Management (IAM) accounts @@ -27673,7 +27721,8 @@ type RestoreDBClusterToPointInTimeInput struct { // SourceDBClusterIdentifier is a required field SourceDBClusterIdentifier *string `type:"string" required:"true"` - // A list of tags. For more information, see Tagging Amazon RDS Resources (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_Tagging.html). + // A list of tags. For more information, see Tagging Amazon RDS Resources (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_Tagging.html) + // in the Amazon RDS User Guide. Tags []*Tag `locationNameList:"Tag" type:"list"` // A value that is set to true to restore the DB cluster to the latest restorable @@ -27902,8 +27951,8 @@ type RestoreDBInstanceFromDBSnapshotInput struct { // The list of logs that the restored DB instance is to export to CloudWatch // Logs. The values in the list depend on the DB engine being used. For more - // information, see Publishing Database Logs to Amazon CloudWatch Logs (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_LogAccess.html#USER_LogAccess.Procedural.UploadtoCloudWatch) - // in the Amazon Relational Database Service User Guide. + // information, see Publishing Database Logs to Amazon CloudWatch Logs (http://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/USER_LogAccess.html#USER_LogAccess.Procedural.UploadtoCloudWatch) + // in the Amazon Aurora User Guide. EnableCloudwatchLogsExports []*string `type:"list"` // True to enable mapping of AWS Identity and Access Management (IAM) accounts @@ -27959,7 +28008,8 @@ type RestoreDBInstanceFromDBSnapshotInput struct { // // The provisioned IOPS value must follow the requirements for your database // engine. For more information, see Amazon RDS Provisioned IOPS Storage to - // Improve Performance (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/CHAP_Storage.html#USER_PIOPS). + // Improve Performance (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/CHAP_Storage.html#USER_PIOPS) + // in the Amazon RDS User Guide. // // Constraints: Must be an integer greater than 1000. Iops *int64 `type:"integer"` @@ -28011,7 +28061,8 @@ type RestoreDBInstanceFromDBSnapshotInput struct { // Default: io1 if the Iops parameter is specified, otherwise standard StorageType *string `type:"string"` - // A list of tags. For more information, see Tagging Amazon RDS Resources (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_Tagging.html). + // A list of tags. For more information, see Tagging Amazon RDS Resources (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_Tagging.html) + // in the Amazon RDS User Guide. Tags []*Tag `locationNameList:"Tag" type:"list"` // The ARN from the key store with which to associate the instance for TDE encryption. @@ -28246,7 +28297,8 @@ type RestoreDBInstanceFromS3Input struct { // The Availability Zone that the DB instance is created in. For information // about AWS Regions and Availability Zones, see Regions and Availability Zones - // (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/Concepts.RegionsAndAvailabilityZones.html). + // (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/Concepts.RegionsAndAvailabilityZones.html) + // in the Amazon RDS User Guide. // // Default: A random, system-chosen Availability Zone in the endpoint's AWS // Region. @@ -28315,8 +28367,8 @@ type RestoreDBInstanceFromS3Input struct { // The list of logs that the restored DB instance is to export to CloudWatch // Logs. The values in the list depend on the DB engine being used. For more - // information, see Publishing Database Logs to Amazon CloudWatch Logs (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_LogAccess.html#USER_LogAccess.Procedural.UploadtoCloudWatch) - // in the Amazon Relational Database Service User Guide. + // information, see Publishing Database Logs to Amazon CloudWatch Logs (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_LogAccess.html#USER_LogAccess.Procedural.UploadtoCloudWatch) + // in the Amazon RDS User Guide. EnableCloudwatchLogsExports []*string `type:"list"` // True to enable mapping of AWS Identity and Access Management (IAM) accounts @@ -28345,7 +28397,8 @@ type RestoreDBInstanceFromS3Input struct { // The amount of Provisioned IOPS (input/output operations per second) to allocate // initially for the DB instance. For information about valid Iops values, see - // see Amazon RDS Provisioned IOPS Storage to Improve Performance (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/CHAP_Storage.html#USER_PIOPS). + // see Amazon RDS Provisioned IOPS Storage to Improve Performance (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/CHAP_Storage.html#USER_PIOPS) + // in the Amazon RDS User Guide. Iops *int64 `type:"integer"` // The AWS KMS key identifier for an encrypted DB instance. @@ -28396,7 +28449,8 @@ type RestoreDBInstanceFromS3Input struct { // The ARN for the IAM role that permits RDS to send enhanced monitoring metrics // to Amazon CloudWatch Logs. For example, arn:aws:iam:123456789012:role/emaccess. // For information on creating a monitoring role, see Setting Up and Enabling - // Enhanced Monitoring (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_Monitoring.OS.html#USER_Monitoring.OS.Enabling). + // Enhanced Monitoring (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_Monitoring.OS.html#USER_Monitoring.OS.Enabling) + // in the Amazon RDS User Guide. // // If MonitoringInterval is set to a value other than 0, then you must supply // a MonitoringRoleArn value. @@ -28430,7 +28484,8 @@ type RestoreDBInstanceFromS3Input struct { Port *int64 `type:"integer"` // The time range each day during which automated backups are created if automated - // backups are enabled. For more information, see The Backup Window (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_WorkingWithAutomatedBackups.html#USER_WorkingWithAutomatedBackups.BackupWindow). + // backups are enabled. For more information, see The Backup Window (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_WorkingWithAutomatedBackups.html#USER_WorkingWithAutomatedBackups.BackupWindow) + // in the Amazon RDS User Guide. // // Constraints: // @@ -28445,7 +28500,8 @@ type RestoreDBInstanceFromS3Input struct { // The time range each week during which system maintenance can occur, in Universal // Coordinated Time (UTC). For more information, see Amazon RDS Maintenance - // Window (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_UpgradeDBInstance.Maintenance.html#Concepts.DBMaintenance). + // Window (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_UpgradeDBInstance.Maintenance.html#Concepts.DBMaintenance) + // in the Amazon RDS User Guide. // // Constraints: // @@ -28512,7 +28568,8 @@ type RestoreDBInstanceFromS3Input struct { StorageType *string `type:"string"` // A list of tags to associate with this DB instance. For more information, - // see Tagging Amazon RDS Resources (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_Tagging.html). + // see Tagging Amazon RDS Resources (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_Tagging.html) + // in the Amazon RDS User Guide. Tags []*Tag `locationNameList:"Tag" type:"list"` // A value that specifies that the DB instance class of the DB instance uses @@ -28892,8 +28949,8 @@ type RestoreDBInstanceToPointInTimeInput struct { // The list of logs that the restored DB instance is to export to CloudWatch // Logs. The values in the list depend on the DB engine being used. For more - // information, see Publishing Database Logs to Amazon CloudWatch Logs (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_LogAccess.html#USER_LogAccess.Procedural.UploadtoCloudWatch) - // in the Amazon Relational Database Service User Guide. + // information, see Publishing Database Logs to Amazon CloudWatch Logs (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_LogAccess.html#USER_LogAccess.Procedural.UploadtoCloudWatch) + // in the Amazon RDS User Guide. EnableCloudwatchLogsExports []*string `type:"list"` // True to enable mapping of AWS Identity and Access Management (IAM) accounts @@ -29018,7 +29075,8 @@ type RestoreDBInstanceToPointInTimeInput struct { // Default: io1 if the Iops parameter is specified, otherwise standard StorageType *string `type:"string"` - // A list of tags. For more information, see Tagging Amazon RDS Resources (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_Tagging.html). + // A list of tags. For more information, see Tagging Amazon RDS Resources (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_Tagging.html) + // in the Amazon RDS User Guide. Tags []*Tag `locationNameList:"Tag" type:"list"` // The name of the new DB instance to be created. @@ -29379,8 +29437,8 @@ func (s *RevokeDBSecurityGroupIngressOutput) SetDBSecurityGroup(v *DBSecurityGro // Contains the scaling configuration of an Aurora Serverless DB cluster. // -// For more information, see Using Amazon Aurora Serverless (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/aurora-serverless.html) -// in the Amazon RDS User Guide. +// For more information, see Using Amazon Aurora Serverless (http://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/aurora-serverless.html) +// in the Amazon Aurora User Guide. type ScalingConfiguration struct { _ struct{} `type:"structure"` @@ -29448,8 +29506,8 @@ func (s *ScalingConfiguration) SetSecondsUntilAutoPause(v int64) *ScalingConfigu // Shows the scaling configuration for an Aurora DB cluster in serverless DB // engine mode. // -// For more information, see Using Amazon Aurora Serverless (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/aurora-serverless.html) -// in the Amazon RDS User Guide. +// For more information, see Using Amazon Aurora Serverless (http://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/aurora-serverless.html) +// in the Amazon Aurora User Guide. type ScalingConfigurationInfo struct { _ struct{} `type:"structure"` diff --git a/vendor/github.com/aws/aws-sdk-go/service/s3/api.go b/vendor/github.com/aws/aws-sdk-go/service/s3/api.go index 0e999ca3302..0279d92d9d9 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/s3/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/s3/api.go @@ -1958,6 +1958,8 @@ const opGetBucketLifecycle = "GetBucketLifecycle" // } // // See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketLifecycle +// +// Deprecated: GetBucketLifecycle has been deprecated func (c *S3) GetBucketLifecycleRequest(input *GetBucketLifecycleInput) (req *request.Request, output *GetBucketLifecycleOutput) { if c.Client.Config.Logger != nil { c.Client.Config.Logger.Log("This operation, GetBucketLifecycle, has been deprecated") @@ -1988,6 +1990,8 @@ func (c *S3) GetBucketLifecycleRequest(input *GetBucketLifecycleInput) (req *req // See the AWS API reference guide for Amazon Simple Storage Service's // API operation GetBucketLifecycle for usage and error information. // See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketLifecycle +// +// Deprecated: GetBucketLifecycle has been deprecated func (c *S3) GetBucketLifecycle(input *GetBucketLifecycleInput) (*GetBucketLifecycleOutput, error) { req, out := c.GetBucketLifecycleRequest(input) return out, req.Send() @@ -2002,6 +2006,8 @@ func (c *S3) GetBucketLifecycle(input *GetBucketLifecycleInput) (*GetBucketLifec // the context is nil a panic will occur. In the future the SDK may create // sub-contexts for http.Requests. See https://golang.org/pkg/context/ // for more information on using Contexts. +// +// Deprecated: GetBucketLifecycleWithContext has been deprecated func (c *S3) GetBucketLifecycleWithContext(ctx aws.Context, input *GetBucketLifecycleInput, opts ...request.Option) (*GetBucketLifecycleOutput, error) { req, out := c.GetBucketLifecycleRequest(input) req.SetContext(ctx) @@ -2333,6 +2339,8 @@ const opGetBucketNotification = "GetBucketNotification" // } // // See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketNotification +// +// Deprecated: GetBucketNotification has been deprecated func (c *S3) GetBucketNotificationRequest(input *GetBucketNotificationConfigurationRequest) (req *request.Request, output *NotificationConfigurationDeprecated) { if c.Client.Config.Logger != nil { c.Client.Config.Logger.Log("This operation, GetBucketNotification, has been deprecated") @@ -2363,6 +2371,8 @@ func (c *S3) GetBucketNotificationRequest(input *GetBucketNotificationConfigurat // See the AWS API reference guide for Amazon Simple Storage Service's // API operation GetBucketNotification for usage and error information. // See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketNotification +// +// Deprecated: GetBucketNotification has been deprecated func (c *S3) GetBucketNotification(input *GetBucketNotificationConfigurationRequest) (*NotificationConfigurationDeprecated, error) { req, out := c.GetBucketNotificationRequest(input) return out, req.Send() @@ -2377,6 +2387,8 @@ func (c *S3) GetBucketNotification(input *GetBucketNotificationConfigurationRequ // the context is nil a panic will occur. In the future the SDK may create // sub-contexts for http.Requests. See https://golang.org/pkg/context/ // for more information on using Contexts. +// +// Deprecated: GetBucketNotificationWithContext has been deprecated func (c *S3) GetBucketNotificationWithContext(ctx aws.Context, input *GetBucketNotificationConfigurationRequest, opts ...request.Option) (*NotificationConfigurationDeprecated, error) { req, out := c.GetBucketNotificationRequest(input) req.SetContext(ctx) @@ -4815,6 +4827,8 @@ const opPutBucketLifecycle = "PutBucketLifecycle" // } // // See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketLifecycle +// +// Deprecated: PutBucketLifecycle has been deprecated func (c *S3) PutBucketLifecycleRequest(input *PutBucketLifecycleInput) (req *request.Request, output *PutBucketLifecycleOutput) { if c.Client.Config.Logger != nil { c.Client.Config.Logger.Log("This operation, PutBucketLifecycle, has been deprecated") @@ -4847,6 +4861,8 @@ func (c *S3) PutBucketLifecycleRequest(input *PutBucketLifecycleInput) (req *req // See the AWS API reference guide for Amazon Simple Storage Service's // API operation PutBucketLifecycle for usage and error information. // See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketLifecycle +// +// Deprecated: PutBucketLifecycle has been deprecated func (c *S3) PutBucketLifecycle(input *PutBucketLifecycleInput) (*PutBucketLifecycleOutput, error) { req, out := c.PutBucketLifecycleRequest(input) return out, req.Send() @@ -4861,6 +4877,8 @@ func (c *S3) PutBucketLifecycle(input *PutBucketLifecycleInput) (*PutBucketLifec // the context is nil a panic will occur. In the future the SDK may create // sub-contexts for http.Requests. See https://golang.org/pkg/context/ // for more information on using Contexts. +// +// Deprecated: PutBucketLifecycleWithContext has been deprecated func (c *S3) PutBucketLifecycleWithContext(ctx aws.Context, input *PutBucketLifecycleInput, opts ...request.Option) (*PutBucketLifecycleOutput, error) { req, out := c.PutBucketLifecycleRequest(input) req.SetContext(ctx) @@ -5126,6 +5144,8 @@ const opPutBucketNotification = "PutBucketNotification" // } // // See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketNotification +// +// Deprecated: PutBucketNotification has been deprecated func (c *S3) PutBucketNotificationRequest(input *PutBucketNotificationInput) (req *request.Request, output *PutBucketNotificationOutput) { if c.Client.Config.Logger != nil { c.Client.Config.Logger.Log("This operation, PutBucketNotification, has been deprecated") @@ -5158,6 +5178,8 @@ func (c *S3) PutBucketNotificationRequest(input *PutBucketNotificationInput) (re // See the AWS API reference guide for Amazon Simple Storage Service's // API operation PutBucketNotification for usage and error information. // See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketNotification +// +// Deprecated: PutBucketNotification has been deprecated func (c *S3) PutBucketNotification(input *PutBucketNotificationInput) (*PutBucketNotificationOutput, error) { req, out := c.PutBucketNotificationRequest(input) return out, req.Send() @@ -5172,6 +5194,8 @@ func (c *S3) PutBucketNotification(input *PutBucketNotificationInput) (*PutBucke // the context is nil a panic will occur. In the future the SDK may create // sub-contexts for http.Requests. See https://golang.org/pkg/context/ // for more information on using Contexts. +// +// Deprecated: PutBucketNotificationWithContext has been deprecated func (c *S3) PutBucketNotificationWithContext(ctx aws.Context, input *PutBucketNotificationInput, opts ...request.Option) (*PutBucketNotificationOutput, error) { req, out := c.PutBucketNotificationRequest(input) req.SetContext(ctx) @@ -7212,6 +7236,8 @@ type CloudFunctionConfiguration struct { CloudFunction *string `type:"string"` // Bucket event for which to send notifications. + // + // Deprecated: Event has been deprecated Event *string `deprecated:"true" type:"string" enum:"Event"` Events []*string `locationName:"Event" type:"list" flattened:"true"` @@ -13032,6 +13058,9 @@ type InputSerialization struct { // Specifies JSON as object's input serialization format. JSON *JSONInput `type:"structure"` + + // Specifies Parquet as object's input serialization format. + Parquet *ParquetInput `type:"structure"` } // String returns the string representation @@ -13062,6 +13091,12 @@ func (s *InputSerialization) SetJSON(v *JSONInput) *InputSerialization { return s } +// SetParquet sets the Parquet field's value. +func (s *InputSerialization) SetParquet(v *ParquetInput) *InputSerialization { + s.Parquet = v + return s +} + type InventoryConfiguration struct { _ struct{} `type:"structure"` @@ -13715,6 +13750,8 @@ type LifecycleRule struct { // Prefix identifying one or more objects to which the rule applies. This is // deprecated; use Filter instead. + // + // Deprecated: Prefix has been deprecated Prefix *string `deprecated:"true" type:"string"` // If 'Enabled', the rule is currently being applied. If 'Disabled', the rule @@ -16487,6 +16524,20 @@ func (s *Owner) SetID(v string) *Owner { return s } +type ParquetInput struct { + _ struct{} `type:"structure"` +} + +// String returns the string representation +func (s ParquetInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s ParquetInput) GoString() string { + return s.String() +} + type Part struct { _ struct{} `type:"structure"` @@ -18817,6 +18868,8 @@ type QueueConfigurationDeprecated struct { _ struct{} `type:"structure"` // Bucket event for which to send notifications. + // + // Deprecated: Event has been deprecated Event *string `deprecated:"true" type:"string" enum:"Event"` Events []*string `locationName:"Event" type:"list" flattened:"true"` @@ -20834,6 +20887,8 @@ type TopicConfigurationDeprecated struct { _ struct{} `type:"structure"` // Bucket event for which to send notifications. + // + // Deprecated: Event has been deprecated Event *string `deprecated:"true" type:"string" enum:"Event"` Events []*string `locationName:"Event" type:"list" flattened:"true"` diff --git a/vendor/vendor.json b/vendor/vendor.json index 26ab237324c..f97c0843a16 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -47,1020 +47,1020 @@ "versionExact": "v1.0.0" }, { - "checksumSHA1": "qO2na7vGPve58xAwBJziIc+BJb4=", + "checksumSHA1": "5euD4kqTIy6wSZq3vFisE2XW+d0=", "path": "github.com/aws/aws-sdk-go/aws", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "DtuTqKH29YnLjrIJkRYX0HQtXY0=", "path": "github.com/aws/aws-sdk-go/aws/arn", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "Y9W+4GimK4Fuxq+vyIskVYFRnX4=", "path": "github.com/aws/aws-sdk-go/aws/awserr", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "yyYr41HZ1Aq0hWc3J5ijXwYEcac=", "path": "github.com/aws/aws-sdk-go/aws/awsutil", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "EwL79Cq6euk+EV/t/n2E+jzPNmU=", "path": "github.com/aws/aws-sdk-go/aws/client", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "uEJU4I6dTKaraQKvrljlYKUZwoc=", "path": "github.com/aws/aws-sdk-go/aws/client/metadata", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "vVSUnICaD9IaBQisCfw0n8zLwig=", "path": "github.com/aws/aws-sdk-go/aws/corehandlers", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "I87y3G8r14yKZQ5NlkupFUJ5jW0=", "path": "github.com/aws/aws-sdk-go/aws/credentials", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "JTilCBYWVAfhbKSnrxCNhE8IFns=", "path": "github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "NUJUTWlc1sV8b7WjfiYc4JZbXl0=", "path": "github.com/aws/aws-sdk-go/aws/credentials/endpointcreds", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "JEYqmF83O5n5bHkupAzA6STm0no=", "path": "github.com/aws/aws-sdk-go/aws/credentials/stscreds", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "eI5TmiOTCFjEUNvWeceFycs9dRU=", "path": "github.com/aws/aws-sdk-go/aws/csm", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "6DRhqSAN7O45gYfRIpwDeuJE8j8=", "path": "github.com/aws/aws-sdk-go/aws/defaults", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "uPkjJo+J10vbEukYYXmf0w7Cn4Q=", "path": "github.com/aws/aws-sdk-go/aws/ec2metadata", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { - "checksumSHA1": "gbuyBRQ+CdbJrzAx+nRNMbPvW7k=", + "checksumSHA1": "DOJDGiPJsP7PI7v95J6YMR/n048=", "path": "github.com/aws/aws-sdk-go/aws/endpoints", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "Ia/AZ2fZp7J4lMO6fpkvfLU/HGY=", "path": "github.com/aws/aws-sdk-go/aws/request", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "zx1mZCdOwgbjBV3jMfb0kyDd//Q=", "path": "github.com/aws/aws-sdk-go/aws/session", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { - "checksumSHA1": "Dj9WOMBPbboyUJV4GB99PwPcO4g=", + "checksumSHA1": "gQ1sGIVnPqvvxa9Ww2g/PGkk16M=", "path": "github.com/aws/aws-sdk-go/aws/signer/v4", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "wjxQlU1PYxrDRFoL1Vek8Wch7jk=", "path": "github.com/aws/aws-sdk-go/internal/sdkio", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "MYLldFRnsZh21TfCkgkXCT3maPU=", "path": "github.com/aws/aws-sdk-go/internal/sdkrand", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "tQVg7Sz2zv+KkhbiXxPH0mh9spg=", "path": "github.com/aws/aws-sdk-go/internal/sdkuri", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "04ypv4x12l4q0TksA1zEVsmgpvw=", "path": "github.com/aws/aws-sdk-go/internal/shareddefaults", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "ZX5QHZb0PrK4UF45um2kaAEiX+8=", "path": "github.com/aws/aws-sdk-go/private/protocol", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { - "checksumSHA1": "GQuRJY72iGQrufDqIaB50zG27u0=", + "checksumSHA1": "0cZnOaE1EcFUuiu4bdHV2k7slQg=", "path": "github.com/aws/aws-sdk-go/private/protocol/ec2query", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "stsUCJVnZ5yMrmzSExbjbYp5tZ8=", "path": "github.com/aws/aws-sdk-go/private/protocol/eventstream", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "bOQjEfKXaTqe7dZhDDER/wZUzQc=", "path": "github.com/aws/aws-sdk-go/private/protocol/eventstream/eventstreamapi", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { - "checksumSHA1": "CTsp/h3FbFg9QizH4bH1abLwljg=", + "checksumSHA1": "tXRIRarT7qepHconxydtO7mXod4=", "path": "github.com/aws/aws-sdk-go/private/protocol/json/jsonutil", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { - "checksumSHA1": "R00RL5jJXRYq1iiK1+PGvMfvXyM=", + "checksumSHA1": "M/NMrlQ2oULxgqzCvOfA30NN+Hc=", "path": "github.com/aws/aws-sdk-go/private/protocol/jsonrpc", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { - "checksumSHA1": "SBBVYdLcocjdPzMWgDuR8vcOfDQ=", + "checksumSHA1": "lj56XJFI2OSp+hEOrFZ+eiEi/yM=", "path": "github.com/aws/aws-sdk-go/private/protocol/query", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "+O6A945eTP9plLpkEMZB0lwBAcg=", "path": "github.com/aws/aws-sdk-go/private/protocol/query/queryutil", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "uRvmEPKcEdv7qc0Ep2zn0E3Xumc=", "path": "github.com/aws/aws-sdk-go/private/protocol/rest", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { - "checksumSHA1": "Rpu8KBtHZgvhkwHxUfaky+qW+G4=", + "checksumSHA1": "OGjEnXhjob/5yfMcW8JHD9NeczY=", "path": "github.com/aws/aws-sdk-go/private/protocol/restjson", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { - "checksumSHA1": "ODo+ko8D6unAxZuN1jGzMcN4QCc=", + "checksumSHA1": "ZZgzuZoMphxAf8wwz9QqpSQdBGc=", "path": "github.com/aws/aws-sdk-go/private/protocol/restxml", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "soXVJWQ/xvEB72Mo6FresaQIxLg=", "path": "github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "F6mth+G7dXN1GI+nktaGo8Lx8aE=", "path": "github.com/aws/aws-sdk-go/private/signer/v2", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "4xFqSOZkwDKot6FJQQgKjhJFoQw=", "path": "github.com/aws/aws-sdk-go/service/acm", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "3e/4A/8NqTOSXEtJ6KhYAqqWnuY=", "path": "github.com/aws/aws-sdk-go/service/acmpca", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { - "checksumSHA1": "FjnLIflNek7g0j5NKT3qFkNtdY8=", + "checksumSHA1": "gnra20TFPzmLbXjGvNyd1I8MP+A=", "path": "github.com/aws/aws-sdk-go/service/apigateway", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "K/ynSj/L2OzW+9Zqs2PRe8NzYUc=", "path": "github.com/aws/aws-sdk-go/service/applicationautoscaling", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "owhfVKeKxjXt4P5KO6PSIjnMLIA=", "path": "github.com/aws/aws-sdk-go/service/appsync", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "3JN52M5wxJMazxQWXB4epL78LNQ=", "path": "github.com/aws/aws-sdk-go/service/athena", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "P2+Mby00TG2KXcfhiVoNoqIT1Kc=", "path": "github.com/aws/aws-sdk-go/service/autoscaling", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "42OCpXRErVgOtgPsuTrdg7y++TA=", "path": "github.com/aws/aws-sdk-go/service/batch", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "kPYTVg109H4HL8CKEf1yQvwKMw4=", "path": "github.com/aws/aws-sdk-go/service/budgets", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "GhANcrglYWrhNSR/NzxNe3jClMk=", "path": "github.com/aws/aws-sdk-go/service/cloud9", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "HmZRIixQ6u+zMz2Qt0iTU42WVZU=", "path": "github.com/aws/aws-sdk-go/service/cloudformation", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { - "checksumSHA1": "1nPdiFsBAEdm+vd7Kk4+8Lx55jw=", + "checksumSHA1": "vji1m2m9ubDFRcv7UuDcD/CBjTc=", "path": "github.com/aws/aws-sdk-go/service/cloudfront", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "iFvc4+KfDeQHigAz2+TmogG1Y7M=", "path": "github.com/aws/aws-sdk-go/service/cloudhsmv2", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "1uyTJ/RTr7c8uL2Kbrp+60PE40M=", "path": "github.com/aws/aws-sdk-go/service/cloudsearch", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { - "checksumSHA1": "3q2FBK4CEarGbVeLCuuX+g1E3jk=", + "checksumSHA1": "XTJxEnVVUOosPxVNHYHpkJ7Cexo=", "path": "github.com/aws/aws-sdk-go/service/cloudtrail", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "o+DFxugR5Cy/Wwlv7GSRRilTW4o=", "path": "github.com/aws/aws-sdk-go/service/cloudwatch", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "bbsROEsQ5BI5F2k8qiArbrpgH94=", "path": "github.com/aws/aws-sdk-go/service/cloudwatchevents", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { - "checksumSHA1": "nGSD4idK9hW8o3U4gLGLESYCpwE=", + "checksumSHA1": "UyVuwts5ZE8rw9jGeubOLvvQaI8=", "path": "github.com/aws/aws-sdk-go/service/cloudwatchlogs", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "D3p9zRPfvqPBDBVGCCVG2wgYh38=", "path": "github.com/aws/aws-sdk-go/service/codebuild", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { - "checksumSHA1": "ysSU5yhqWT4+deQUYZiI8/1tJ2c=", + "checksumSHA1": "rvZxiKvno7mVcW7tS+rcF6mDWsY=", "path": "github.com/aws/aws-sdk-go/service/codecommit", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "GvjVVg5btXuEFEHqyoe19BZogGw=", "path": "github.com/aws/aws-sdk-go/service/codedeploy", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "vklitYIK0AiOXA0obSTq0c04pc4=", "path": "github.com/aws/aws-sdk-go/service/codepipeline", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "rL0O6L1zSJ/UQE0kEWUoCOOFDog=", "path": "github.com/aws/aws-sdk-go/service/cognitoidentity", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "gkmRw2ZP/uU+V3b9v7CQM0CA0xs=", "path": "github.com/aws/aws-sdk-go/service/cognitoidentityprovider", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { - "checksumSHA1": "o9WTZk66Jlu+0UdO1wmtO3qp8ps=", + "checksumSHA1": "ZKsjHOyH5z0PuKFcNtwlbhxwHFg=", "path": "github.com/aws/aws-sdk-go/service/configservice", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { - "checksumSHA1": "/y7nXSnR9OqMoxlIl1hFcCk5kT8=", + "checksumSHA1": "RmFFvwnIx0l3buDtcoQ3PWkW7+g=", "path": "github.com/aws/aws-sdk-go/service/databasemigrationservice", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "TWva9VAs3zgU/FQjJkiUvY3wIXw=", "path": "github.com/aws/aws-sdk-go/service/dax", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "LfJ0Owy9HyaulKTvDEgCdkChMG8=", "path": "github.com/aws/aws-sdk-go/service/devicefarm", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { - "checksumSHA1": "PBdPTvba1Ci9LrAs0VExIAWtdKQ=", + "checksumSHA1": "zblSxBuyR1S5z7oSouEdCXoCUuE=", "path": "github.com/aws/aws-sdk-go/service/directconnect", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "a02+OXxnVBBBeaZpgs8dXUHj8b0=", "path": "github.com/aws/aws-sdk-go/service/directoryservice", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "xoFqND2spsYdyoui+wKepfGQS8c=", "path": "github.com/aws/aws-sdk-go/service/dlm", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { - "checksumSHA1": "XRzDF1GFEnm7CWURxz8oirdEty4=", + "checksumSHA1": "42xYT0wxX/R9vu4C9+cHtBZkvxY=", "path": "github.com/aws/aws-sdk-go/service/dynamodb", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "QutiSGcdlnEisOq+KNZ872PAl7I=", "path": "github.com/aws/aws-sdk-go/service/ec2", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "VD7bAh0n/UgOwRBPe5y38Ow/dHU=", "path": "github.com/aws/aws-sdk-go/service/ecr", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "Q8RuvleYpFO1hlm/eKRbg5wG/nQ=", "path": "github.com/aws/aws-sdk-go/service/ecs", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "NDrEwIZeUSlHgENwBzVdy0KcCCY=", "path": "github.com/aws/aws-sdk-go/service/efs", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "dSndJIyIFwpciskUn2ZmUvIdR+c=", "path": "github.com/aws/aws-sdk-go/service/eks", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "kvsll2DfqS1hg97xSWMIcMan5as=", "path": "github.com/aws/aws-sdk-go/service/elasticache", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "G1BmSThB0eTjq8gSfjA+PnB9zs0=", "path": "github.com/aws/aws-sdk-go/service/elasticbeanstalk", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "O++z0DZj/MzSNWgVfV+SYzTS/fM=", "path": "github.com/aws/aws-sdk-go/service/elasticsearchservice", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { - "checksumSHA1": "VFjWDQMsGpFMrNfcc//ABRpo6Ew=", + "checksumSHA1": "qyRoP+xRrXcGnnUu78L8hv9Qar8=", "path": "github.com/aws/aws-sdk-go/service/elastictranscoder", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { - "checksumSHA1": "Gp+QZjtg8PCNVi9X8m2SqtFvMas=", + "checksumSHA1": "SnJVGrH1gX3X7pfugBZ5dWhQM6E=", "path": "github.com/aws/aws-sdk-go/service/elb", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "wIiqI9GFAV2AQ32o2kEYHNyqVig=", "path": "github.com/aws/aws-sdk-go/service/elbv2", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { - "checksumSHA1": "oNOLs79R42Vsj/jYTYtrbyTWxcw=", + "checksumSHA1": "7cq3bZMJV152e3ocGW8mbI657J0=", "path": "github.com/aws/aws-sdk-go/service/emr", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { - "checksumSHA1": "3hICqVOs1WmluYMZN9fTMbDQSyM=", + "checksumSHA1": "VO+EdD/iXQVzjiuIeCQhVAsm9SI=", "path": "github.com/aws/aws-sdk-go/service/firehose", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "tNVmAgvnURWLWibVCL7vIDYU7UM=", "path": "github.com/aws/aws-sdk-go/service/fms", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "J1SHh0J6kX8JBD0+TQCFP+1Kij4=", "path": "github.com/aws/aws-sdk-go/service/gamelift", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "BB3/VzUU5Rg4KgrezJ17D4kCnwA=", "path": "github.com/aws/aws-sdk-go/service/glacier", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "A1E5569KvbsmoB9/eA0YxBYmjMI=", "path": "github.com/aws/aws-sdk-go/service/glue", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "HNndTio5+fNOiLr23i+QZpPp8HU=", "path": "github.com/aws/aws-sdk-go/service/guardduty", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "ae+jhUirSvN0IXPVU7X7xc+EbFE=", "path": "github.com/aws/aws-sdk-go/service/iam", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "39yMWxFP9XB+8wWWCZX4vkNWmxU=", "path": "github.com/aws/aws-sdk-go/service/inspector", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { - "checksumSHA1": "G1GZpCmKREPPgzLOBrvXmiyhbnc=", + "checksumSHA1": "wAWGvZ95XguL4gT8AEYNtum2eZM=", "path": "github.com/aws/aws-sdk-go/service/iot", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "q9HZ/0/lBSRKtjHXMegmcRcazPo=", "path": "github.com/aws/aws-sdk-go/service/kinesis", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "nUdxsOW9jg+m+sWZYPu7oX9rZo8=", "path": "github.com/aws/aws-sdk-go/service/kinesisanalytics", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "vaMnUnRVDkpHp/e4f3dFX20JblM=", "path": "github.com/aws/aws-sdk-go/service/kms", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { - "checksumSHA1": "K4OamITKC7PKo1eHrSl0z8Visg0=", + "checksumSHA1": "5dqI6y+bI5brPj7ReZT/NJSGzrM=", "path": "github.com/aws/aws-sdk-go/service/lambda", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "nMklVJilxMmhlmnnquFJB97isMk=", "path": "github.com/aws/aws-sdk-go/service/lexmodelbuildingservice", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { - "checksumSHA1": "tX/3xEkl13DuKNIO0v3qYseEIvI=", + "checksumSHA1": "ROCCysE4/I6Tu5OCs6fuc0uTXBo=", "path": "github.com/aws/aws-sdk-go/service/lightsail", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "+l6bA5aVzmBXH2Isj1xZkd5RKNY=", "path": "github.com/aws/aws-sdk-go/service/macie", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { - "checksumSHA1": "WfsMSOC0DxRApVecptw2244Cc6w=", + "checksumSHA1": "yLEEM14iEZqEH3C7ieCw+puIjiU=", "path": "github.com/aws/aws-sdk-go/service/mediaconvert", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "PE3129yEUwSvn0rg3P86Pxqnnps=", "path": "github.com/aws/aws-sdk-go/service/medialive", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { - "checksumSHA1": "4YkW/odfpvJHVz5p2RCW3cWaHOQ=", + "checksumSHA1": "7/SSsXiRqnukDTUDeEg1ToMD6nQ=", "path": "github.com/aws/aws-sdk-go/service/mediapackage", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "9NU6dJOvKvcgnl/4eUdwy4YD5ss=", "path": "github.com/aws/aws-sdk-go/service/mediastore", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "qyIVtaN5mzPq4d7BDj9YpYtifKs=", "path": "github.com/aws/aws-sdk-go/service/mediastoredata", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "1jKxCBvS+zKzq6p2i4BqLXYHm48=", "path": "github.com/aws/aws-sdk-go/service/mq", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { - "checksumSHA1": "E3i2/WM1kDE7WBOSRnDsZkwmZwI=", + "checksumSHA1": "44C523Sshu3BkoWwmXxawrUF2LQ=", "path": "github.com/aws/aws-sdk-go/service/neptune", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "x3PsW91a7fh+Q466y3WM3fdtnGg=", "path": "github.com/aws/aws-sdk-go/service/opsworks", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "YCd2EU1DPiO0QTRZk6G1fLZAyg0=", "path": "github.com/aws/aws-sdk-go/service/organizations", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "e5v4Cc9/0H2ngQNuvVyj2Mt0vi0=", "path": "github.com/aws/aws-sdk-go/service/pinpoint", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "j1i1tZ94/kDvvzgpv5xqxwNvgyY=", "path": "github.com/aws/aws-sdk-go/service/pricing", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { - "checksumSHA1": "EvlN1OFs7c7kQEIuvkwE/yTuv8o=", + "checksumSHA1": "vQ0oeZ+9gR8zIbkYMEA87D/vAas=", "path": "github.com/aws/aws-sdk-go/service/rds", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "1zThqt8de3tv6wOzT/8mKxqJ5kE=", "path": "github.com/aws/aws-sdk-go/service/redshift", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "KlM6azZ5G09MmPg+lzEizW2qaLA=", "path": "github.com/aws/aws-sdk-go/service/route53", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { - "checksumSHA1": "DmKatmbYsvm+MoCP01PCdQ6Y6Tk=", + "checksumSHA1": "u5BxHJjA59ZgfZYvR5aJgWAthM8=", "path": "github.com/aws/aws-sdk-go/service/s3", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "qB34t8+gQAYbx7kaxDIllgM9MpQ=", "path": "github.com/aws/aws-sdk-go/service/sagemaker", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "FkBALtXiN4PCzFnl/G2gXFFLV3E=", "path": "github.com/aws/aws-sdk-go/service/secretsmanager", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "Y29bmjwKXcPg0d0WvZNFGdhd4+E=", "path": "github.com/aws/aws-sdk-go/service/serverlessapplicationrepository", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "T8dOJ1jjEBdogUE03oRPRJCOY3k=", "path": "github.com/aws/aws-sdk-go/service/servicecatalog", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "UhJ0RdPXzdMOUEBWREB5Zi9lgmY=", "path": "github.com/aws/aws-sdk-go/service/servicediscovery", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "0vtFXRYnhlCCq8/zPv1O1YWIoSg=", "path": "github.com/aws/aws-sdk-go/service/ses", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "1rJbvLXRsCzWhTihruRq/i0Zawg=", "path": "github.com/aws/aws-sdk-go/service/sfn", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "hliWYTmov/HswyMpYq93zJtdkk0=", "path": "github.com/aws/aws-sdk-go/service/simpledb", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "bW9FW0Qe3VURaSoY305kA/wCFrM=", "path": "github.com/aws/aws-sdk-go/service/sns", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "ECIZck5xhocpUl8GeUAdeSnCgvg=", "path": "github.com/aws/aws-sdk-go/service/sqs", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "307CISQxMTTnatZ//6/p8obzeGs=", "path": "github.com/aws/aws-sdk-go/service/ssm", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "TeuakooizAybzyMQyTXllUyhfBg=", "path": "github.com/aws/aws-sdk-go/service/storagegateway", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "UhIVLDgQc19wjrPj8pP7Fu2UwWc=", "path": "github.com/aws/aws-sdk-go/service/sts", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "zSqEhiGtEK6ll3f1Rlf2tuDKQA8=", "path": "github.com/aws/aws-sdk-go/service/swf", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "N/w20GqQBU7sVFbshxOA3AWAvDU=", "path": "github.com/aws/aws-sdk-go/service/waf", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "ocF/2t8BOrkUpc62h6kHH0WtfTg=", "path": "github.com/aws/aws-sdk-go/service/wafregional", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "oe8l2ibuhzz7fWM3f64cWnHwFy8=", "path": "github.com/aws/aws-sdk-go/service/workspaces", - "revision": "04abd557eeaab3cfdded45467eea00fc03db9cb9", - "revisionTime": "2018-08-31T22:30:03Z", - "version": "v1.15.26", - "versionExact": "v1.15.26" + "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", + "revisionTime": "2018-09-07T21:05:52Z", + "version": "v1.15.31", + "versionExact": "v1.15.31" }, { "checksumSHA1": "yBBHqv7DvZNsZdF00SO8PbEQAKU=", From 6b858ea06098c033c470e7d11385079ca0315311 Mon Sep 17 00:00:00 2001 From: saravanan30erd Date: Sun, 9 Sep 2018 20:04:30 +0400 Subject: [PATCH 090/184] acceptance test for api_gateway_stage --- aws/resource_aws_api_gateway_stage_test.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/aws/resource_aws_api_gateway_stage_test.go b/aws/resource_aws_api_gateway_stage_test.go index c2cd6007cb3..dc9dfd72bbb 100644 --- a/aws/resource_aws_api_gateway_stage_test.go +++ b/aws/resource_aws_api_gateway_stage_test.go @@ -32,6 +32,7 @@ func TestAccAWSAPIGatewayStage_basic(t *testing.T) { resource.TestCheckResourceAttr("aws_api_gateway_stage.test", "tags.%", "1"), resource.TestCheckResourceAttrSet("aws_api_gateway_stage.test", "execution_arn"), resource.TestCheckResourceAttrSet("aws_api_gateway_stage.test", "invoke_url"), + resource.TestCheckResourceAttr("aws_api_gateway_stage.test", "xray_tracing_enabled", "true"), ), }, { @@ -47,6 +48,7 @@ func TestAccAWSAPIGatewayStage_basic(t *testing.T) { resource.TestCheckResourceAttr("aws_api_gateway_stage.test", "stage_name", "prod"), resource.TestCheckResourceAttr("aws_api_gateway_stage.test", "cache_cluster_enabled", "false"), resource.TestCheckResourceAttr("aws_api_gateway_stage.test", "tags.%", "2"), + resource.TestCheckResourceAttr("aws_api_gateway_stage.test", "xray_tracing_enabled", "false"), ), }, { @@ -59,6 +61,7 @@ func TestAccAWSAPIGatewayStage_basic(t *testing.T) { resource.TestCheckResourceAttr("aws_api_gateway_stage.test", "tags.%", "1"), resource.TestCheckResourceAttrSet("aws_api_gateway_stage.test", "execution_arn"), resource.TestCheckResourceAttrSet("aws_api_gateway_stage.test", "invoke_url"), + resource.TestCheckResourceAttr("aws_api_gateway_stage.test", "xray_tracing_enabled", "true"), ), }, }, @@ -262,6 +265,7 @@ resource "aws_api_gateway_stage" "test" { deployment_id = "${aws_api_gateway_deployment.dev.id}" cache_cluster_enabled = true cache_cluster_size = "0.5" + xray_tracing_enabled = true variables { one = "1" two = "2" @@ -281,6 +285,7 @@ resource "aws_api_gateway_stage" "test" { deployment_id = "${aws_api_gateway_deployment.dev.id}" cache_cluster_enabled = false description = "Hello world" + xray_tracing_enabled = false variables { one = "1" three = "3" From 5f0a22f18edcaa72f3995c50bfab1ab04a5ef3d3 Mon Sep 17 00:00:00 2001 From: saravanan30erd Date: Sun, 9 Sep 2018 21:40:52 +0400 Subject: [PATCH 091/184] update xray_tracing in api_gateway_deployment --- aws/resource_aws_api_gateway_deployment.go | 53 +++++++++++++++---- ...esource_aws_api_gateway_deployment_test.go | 15 ++++-- 2 files changed, 53 insertions(+), 15 deletions(-) diff --git a/aws/resource_aws_api_gateway_deployment.go b/aws/resource_aws_api_gateway_deployment.go index f8fff84d464..9428f4cbaaf 100644 --- a/aws/resource_aws_api_gateway_deployment.go +++ b/aws/resource_aws_api_gateway_deployment.go @@ -65,6 +65,12 @@ func resourceAwsApiGatewayDeployment() *schema.Resource { Type: schema.TypeString, Computed: true, }, + + "xray_tracing_enabled": { + Type: schema.TypeBool, + Optional: true, + ForceNew: true, + }, }, } } @@ -74,19 +80,29 @@ func resourceAwsApiGatewayDeploymentCreate(d *schema.ResourceData, meta interfac // Create the gateway log.Printf("[DEBUG] Creating API Gateway Deployment") - variables := make(map[string]string) - for k, v := range d.Get("variables").(map[string]interface{}) { - variables[k] = v.(string) + input := &apigateway.CreateDeploymentInput{ + RestApiId: aws.String(d.Get("rest_api_id").(string)), + StageName: aws.String(d.Get("stage_name").(string)), } - var err error - deployment, err := conn.CreateDeployment(&apigateway.CreateDeploymentInput{ - RestApiId: aws.String(d.Get("rest_api_id").(string)), - StageName: aws.String(d.Get("stage_name").(string)), - Description: aws.String(d.Get("description").(string)), - StageDescription: aws.String(d.Get("stage_description").(string)), - Variables: aws.StringMap(variables), - }) + if v, ok := d.GetOk("description"); ok { + input.Description = aws.String(v.(string)) + } + if v, ok := d.GetOk("stage_description"); ok { + input.StageDescription = aws.String(v.(string)) + } + if v, ok := d.GetOk("xray_tracing_enabled"); ok { + input.TracingEnabled = aws.Bool(v.(bool)) + } + if v, ok := d.GetOk("variables"); ok { + variables := make(map[string]string) + for k, v := range v.(map[string]interface{}) { + variables[k] = v.(string) + } + input.Variables = aws.StringMap(variables) + } + + deployment, err := conn.CreateDeployment(input) if err != nil { return fmt.Errorf("Error creating API Gateway Deployment: %s", err) } @@ -135,6 +151,21 @@ func resourceAwsApiGatewayDeploymentRead(d *schema.ResourceData, meta interface{ log.Printf("[DEBUG] Error setting created_date: %s", err) } + input := &apigateway.GetStageInput{ + RestApiId: aws.String(d.Get("rest_api_id").(string)), + StageName: aws.String(d.Get("stage_name").(string)), + } + stage, err := conn.GetStage(input) + if err != nil { + return err + } + d.Set("xray_tracing_enabled", stage.TracingEnabled) + d.Set("stage_description", stage.Description) + d.Set("stage_name", stage.StageName) + if err := d.Set("variables", aws.StringValueMap(stage.Variables)); err != nil { + return fmt.Errorf("error setting stage variables: %s", err) + } + return nil } diff --git a/aws/resource_aws_api_gateway_deployment_test.go b/aws/resource_aws_api_gateway_deployment_test.go index 7cf58a4e47e..d487beb1c97 100644 --- a/aws/resource_aws_api_gateway_deployment_test.go +++ b/aws/resource_aws_api_gateway_deployment_test.go @@ -7,12 +7,14 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/service/apigateway" + "github.com/hashicorp/terraform/helper/acctest" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" ) func TestAccAWSAPIGatewayDeployment_basic(t *testing.T) { var conf apigateway.Deployment + rName := acctest.RandString(8) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -20,7 +22,7 @@ func TestAccAWSAPIGatewayDeployment_basic(t *testing.T) { CheckDestroy: testAccCheckAWSAPIGatewayDeploymentDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSAPIGatewayDeploymentConfig, + Config: testAccAWSAPIGatewayDeploymentConfig(rName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSAPIGatewayDeploymentExists("aws_api_gateway_deployment.test", &conf), resource.TestCheckResourceAttr( @@ -31,6 +33,8 @@ func TestAccAWSAPIGatewayDeployment_basic(t *testing.T) { "aws_api_gateway_deployment.test", "variables.a", "2"), resource.TestCheckResourceAttrSet( "aws_api_gateway_deployment.test", "created_date"), + resource.TestCheckResourceAttr( + "aws_api_gateway_deployment.test", "xray_tracing_enabled", "true"), ), }, }, @@ -103,9 +107,10 @@ func testAccCheckAWSAPIGatewayDeploymentDestroy(s *terraform.State) error { return nil } -const testAccAWSAPIGatewayDeploymentConfig = ` +func testAccAWSAPIGatewayDeploymentConfig(rName string) string { + return fmt.Sprintf(` resource "aws_api_gateway_rest_api" "test" { - name = "test" + name = "tf-test-%s" } resource "aws_api_gateway_resource" "test" { @@ -151,9 +156,11 @@ resource "aws_api_gateway_deployment" "test" { rest_api_id = "${aws_api_gateway_rest_api.test.id}" stage_name = "test" description = "This is a test" + xray_tracing_enabled = true variables = { "a" = "2" } } -` +`, rName) +} From ebf97ad43071f6dab6f791383030d45d44252d5d Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Mon, 10 Sep 2018 09:11:43 -0400 Subject: [PATCH 092/184] tests/resource/aws_autoscaling_group: Fix gofmt -s issue --- aws/resource_aws_autoscaling_group_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws/resource_aws_autoscaling_group_test.go b/aws/resource_aws_autoscaling_group_test.go index 386ecd332ea..fa395f809b9 100644 --- a/aws/resource_aws_autoscaling_group_test.go +++ b/aws/resource_aws_autoscaling_group_test.go @@ -998,7 +998,7 @@ func TestAccAWSAutoScalingGroup_LaunchTemplate_IAMInstanceProfile(t *testing.T) Providers: testAccProviders, CheckDestroy: testAccCheckAWSAutoScalingGroupDestroy, Steps: []resource.TestStep{ - resource.TestStep{ + { Config: testAccAWSAutoScalingGroupConfig_LaunchTemplate_IAMInstanceProfile(rName), Check: resource.ComposeTestCheckFunc( testAccCheckAWSAutoScalingGroupExists(resourceName, &group), From 93bea96841a585c3b908e3e7342daa7f534868ab Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Mon, 10 Sep 2018 09:30:24 -0400 Subject: [PATCH 093/184] provider: Fix and enable misspell linting for source code and website ``` $ make lint ==> Checking source code against linters... $ make website-lint ==> Checking website against linters... $ ``` --- .gometalinter.json | 1 + .travis.yml | 1 + aws/import_aws_security_group.go | 2 +- aws/provider.go | 2 +- aws/resource_aws_autoscaling_attachment.go | 6 +++--- aws/resource_aws_autoscaling_attachment_test.go | 2 +- aws/resource_aws_batch_compute_environment_test.go | 4 ++-- aws/resource_aws_codecommit_trigger.go | 2 +- aws/resource_aws_codedeploy_deployment_group_test.go | 4 ++-- aws/resource_aws_cognito_user_pool_test.go | 2 +- aws/resource_aws_elasticache_cluster.go | 2 +- aws/resource_aws_emr_security_configuration.go | 2 +- aws/resource_aws_iam_account_alias_test.go | 2 +- aws/resource_aws_iam_user_login_profile.go | 2 +- aws/resource_aws_instance.go | 2 +- aws/resource_aws_kms_grant.go | 2 +- aws/resource_aws_lambda_permission.go | 2 +- aws/resource_aws_lightsail_instance.go | 2 +- aws/resource_aws_lightsail_key_pair.go | 2 +- aws/resource_aws_opsworks_rds_db_instance.go | 2 +- aws/resource_aws_route.go | 2 +- aws/resource_aws_security_group_rules_matching_test.go | 4 ++-- aws/resource_aws_security_group_test.go | 4 ++-- aws/structure.go | 4 ++-- website/docs/r/codedeploy_deployment_group.html.markdown | 2 +- .../docs/r/config_configuration_aggregator.html.markdown | 2 +- website/docs/r/db_instance.html.markdown | 2 +- website/docs/r/emr_security_configuration.html.markdown | 2 +- website/docs/r/lightsail_key_pair.html.markdown | 2 +- website/docs/r/ssm_activation.html.markdown | 4 ++-- 30 files changed, 38 insertions(+), 36 deletions(-) diff --git a/.gometalinter.json b/.gometalinter.json index b7916fd9fb4..b073f2a92c5 100644 --- a/.gometalinter.json +++ b/.gometalinter.json @@ -4,6 +4,7 @@ "errcheck", "gofmt", "interfacer", + "misspell", "structcheck", "vet" ], diff --git a/.travis.yml b/.travis.yml index a2690c4ae39..d04fbb8da7e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,6 +21,7 @@ script: - make lint - make test - make vendor-status +- make website-lint - make website-test branches: diff --git a/aws/import_aws_security_group.go b/aws/import_aws_security_group.go index d1a6341f063..3954ed23988 100644 --- a/aws/import_aws_security_group.go +++ b/aws/import_aws_security_group.go @@ -51,7 +51,7 @@ func resourceAwsSecurityGroupImportState( func resourceAwsSecurityGroupImportStatePerm(sg *ec2.SecurityGroup, ruleType string, perm *ec2.IpPermission) ([]*schema.ResourceData, error) { /* - Create a seperate Security Group Rule for: + Create a separate Security Group Rule for: * The collection of IpRanges (cidr_blocks) * The collection of Ipv6Ranges (ipv6_cidr_blocks) * Each individual UserIdGroupPair (source_security_group_id) diff --git a/aws/provider.go b/aws/provider.go index bf80ad57383..cfef6f46bef 100644 --- a/aws/provider.go +++ b/aws/provider.go @@ -671,7 +671,7 @@ func Provider() terraform.ResourceProvider { // ALBs are actually LBs because they can be type `network` or `application` // To avoid regressions, we will add a new resource for each and they both point // back to the old ALB version. IF the Terraform supported aliases for resources - // this would be a whole lot simplier + // this would be a whole lot simpler "aws_alb": resourceAwsLb(), "aws_lb": resourceAwsLb(), "aws_alb_listener": resourceAwsLbListener(), diff --git a/aws/resource_aws_autoscaling_attachment.go b/aws/resource_aws_autoscaling_attachment.go index 321a98c75bb..0c2748df076 100644 --- a/aws/resource_aws_autoscaling_attachment.go +++ b/aws/resource_aws_autoscaling_attachment.go @@ -78,7 +78,7 @@ func resourceAwsAutoscalingAttachmentRead(d *schema.ResourceData, meta interface asgconn := meta.(*AWSClient).autoscalingconn asgName := d.Get("autoscaling_group_name").(string) - // Retrieve the ASG properites to get list of associated ELBs + // Retrieve the ASG properties to get list of associated ELBs asg, err := getAwsAutoscalingGroup(asgName, asgconn) if err != nil { @@ -101,7 +101,7 @@ func resourceAwsAutoscalingAttachmentRead(d *schema.ResourceData, meta interface } if !found { - log.Printf("[WARN] Association for %s was not found in ASG assocation", v.(string)) + log.Printf("[WARN] Association for %s was not found in ASG association", v.(string)) d.SetId("") } } @@ -117,7 +117,7 @@ func resourceAwsAutoscalingAttachmentRead(d *schema.ResourceData, meta interface } if !found { - log.Printf("[WARN] Association for %s was not found in ASG assocation", v.(string)) + log.Printf("[WARN] Association for %s was not found in ASG association", v.(string)) d.SetId("") } } diff --git a/aws/resource_aws_autoscaling_attachment_test.go b/aws/resource_aws_autoscaling_attachment_test.go index 90ea56c516a..dde109216e5 100644 --- a/aws/resource_aws_autoscaling_attachment_test.go +++ b/aws/resource_aws_autoscaling_attachment_test.go @@ -136,7 +136,7 @@ func testAccCheckAWSAutocalingAlbAttachmentExists(asgname string, targetGroupCou }) if err != nil { - return fmt.Errorf("Recieved an error when attempting to load %s: %s", asg, err) + return fmt.Errorf("Received an error when attempting to load %s: %s", asg, err) } if targetGroupCount != len(actual.AutoScalingGroups[0].TargetGroupARNs) { diff --git a/aws/resource_aws_batch_compute_environment_test.go b/aws/resource_aws_batch_compute_environment_test.go index 565e7243958..b4bcb54fe56 100644 --- a/aws/resource_aws_batch_compute_environment_test.go +++ b/aws/resource_aws_batch_compute_environment_test.go @@ -321,7 +321,7 @@ func testAccCheckBatchComputeEnvironmentDestroy(s *terraform.State) error { }) if err != nil { - return fmt.Errorf("Error occured when get compute environment information.") + return fmt.Errorf("Error occurred when get compute environment information.") } if len(result.ComputeEnvironments) == 1 { return fmt.Errorf("Compute environment still exists.") @@ -348,7 +348,7 @@ func testAccCheckAwsBatchComputeEnvironmentExists() resource.TestCheckFunc { }) if err != nil { - return fmt.Errorf("Error occured when get compute environment information.") + return fmt.Errorf("Error occurred when get compute environment information.") } if len(result.ComputeEnvironments) == 0 { return fmt.Errorf("Compute environment doesn't exists.") diff --git a/aws/resource_aws_codecommit_trigger.go b/aws/resource_aws_codecommit_trigger.go index 9ac1f5fe190..bbb77ed2542 100644 --- a/aws/resource_aws_codecommit_trigger.go +++ b/aws/resource_aws_codecommit_trigger.go @@ -134,7 +134,7 @@ func resourceAwsCodeCommitTriggerDelete(d *schema.ResourceData, meta interface{} func expandAwsCodeCommitTriggers(configured []interface{}) []*codecommit.RepositoryTrigger { triggers := make([]*codecommit.RepositoryTrigger, 0, len(configured)) // Loop over our configured triggers and create - // an array of aws-sdk-go compatabile objects + // an array of aws-sdk-go compatible objects for _, lRaw := range configured { data := lRaw.(map[string]interface{}) t := &codecommit.RepositoryTrigger{ diff --git a/aws/resource_aws_codedeploy_deployment_group_test.go b/aws/resource_aws_codedeploy_deployment_group_test.go index 9f107231c5e..de58a9651b8 100644 --- a/aws/resource_aws_codedeploy_deployment_group_test.go +++ b/aws/resource_aws_codedeploy_deployment_group_test.go @@ -882,7 +882,7 @@ func TestAccAWSCodeDeployDeploymentGroup_loadBalancerInfo_update(t *testing.T) { } // Without "Computed: true" on load_balancer_info, removing the resource -// from configuration causes an error, becuase the remote resource still exists. +// from configuration causes an error, because the remote resource still exists. func TestAccAWSCodeDeployDeploymentGroup_loadBalancerInfo_delete(t *testing.T) { var group codedeploy.DeploymentGroupInfo @@ -1186,7 +1186,7 @@ func TestAccAWSCodeDeployDeploymentGroup_blueGreenDeploymentConfiguration_update } // Without "Computed: true" on blue_green_deployment_config, removing the resource -// from configuration causes an error, becuase the remote resource still exists. +// from configuration causes an error, because the remote resource still exists. func TestAccAWSCodeDeployDeploymentGroup_blueGreenDeploymentConfiguration_delete(t *testing.T) { var group codedeploy.DeploymentGroupInfo diff --git a/aws/resource_aws_cognito_user_pool_test.go b/aws/resource_aws_cognito_user_pool_test.go index d20007abb09..ad8929e4379 100644 --- a/aws/resource_aws_cognito_user_pool_test.go +++ b/aws/resource_aws_cognito_user_pool_test.go @@ -1097,7 +1097,7 @@ resource "aws_cognito_user_pool" "pool" { sms_verification_message = "{####} Baz" # Setting Verification template attributes like EmailMessage, EmailSubject or SmsMessage - # will implicitely set EmailVerificationMessage, EmailVerificationSubject and SmsVerificationMessage + # will implicitly set EmailVerificationMessage, EmailVerificationSubject and SmsVerificationMessage # attributes. verification_message_template { default_email_option = "CONFIRM_WITH_LINK" diff --git a/aws/resource_aws_elasticache_cluster.go b/aws/resource_aws_elasticache_cluster.go index 49b0d42b783..a2bea31f45f 100644 --- a/aws/resource_aws_elasticache_cluster.go +++ b/aws/resource_aws_elasticache_cluster.go @@ -111,7 +111,7 @@ func resourceAwsElastiCacheCommonSchema() map[string]*schema.Schema { Optional: true, ForceNew: true, DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool { - // Supress default memcached/redis ports when not defined + // Suppress default memcached/redis ports when not defined if !d.IsNewResource() && new == "0" && (old == "6379" || old == "11211") { return true } diff --git a/aws/resource_aws_emr_security_configuration.go b/aws/resource_aws_emr_security_configuration.go index ff25619a361..0cb3131513f 100644 --- a/aws/resource_aws_emr_security_configuration.go +++ b/aws/resource_aws_emr_security_configuration.go @@ -85,7 +85,7 @@ func resourceAwsEmrSecurityConfigurationRead(d *schema.ResourceData, meta interf }) if err != nil { if isAWSErr(err, "InvalidRequestException", "does not exist") { - log.Printf("[WARN] EMR Security Configuraiton (%s) not found, removing from state", d.Id()) + log.Printf("[WARN] EMR Security Configuration (%s) not found, removing from state", d.Id()) d.SetId("") return nil } diff --git a/aws/resource_aws_iam_account_alias_test.go b/aws/resource_aws_iam_account_alias_test.go index 455af4a9796..6d09eee86c0 100644 --- a/aws/resource_aws_iam_account_alias_test.go +++ b/aws/resource_aws_iam_account_alias_test.go @@ -59,7 +59,7 @@ func testAccAWSIAMAccountAlias_basic_with_datasource(t *testing.T) { // We expect a non-empty plan due to the way data sources and depends_on // work, or don't work. See https://github.com/hashicorp/terraform/issues/11139#issuecomment-275121893 // We accept this limitation and feel this test is OK because of the - // explicity check above + // explicitly check above ExpectNonEmptyPlan: true, }, }, diff --git a/aws/resource_aws_iam_user_login_profile.go b/aws/resource_aws_iam_user_login_profile.go index 98c0ac4e8f1..37735ccd0f1 100644 --- a/aws/resource_aws_iam_user_login_profile.go +++ b/aws/resource_aws_iam_user_login_profile.go @@ -71,7 +71,7 @@ func generateIAMPassword(length int) string { result := make([]byte, length) charsetSize := big.NewInt(int64(len(charset))) - // rather than trying to artifically add specific characters from each + // rather than trying to artificially add specific characters from each // class to the password to match the policy, we generate passwords // randomly and reject those that don't match. // diff --git a/aws/resource_aws_instance.go b/aws/resource_aws_instance.go index 65637d7a05c..b3b592191d5 100644 --- a/aws/resource_aws_instance.go +++ b/aws/resource_aws_instance.go @@ -988,7 +988,7 @@ func resourceAwsInstanceUpdate(d *schema.ResourceData, meta interface{}) error { // Because we're calling Update prior to Read, and the default value of `source_dest_check` is `true`, // HasChange() thinks there is a diff between what is set on the instance and what is set in state. We need to ensure that - // if a diff has occured, it's not because it's a new instance. + // if a diff has occurred, it's not because it's a new instance. if d.HasChange("source_dest_check") && !d.IsNewResource() || d.IsNewResource() && !sourceDestCheck { // SourceDestCheck can only be set on VPC instances // AWS will return an error of InvalidParameterCombination if we attempt diff --git a/aws/resource_aws_kms_grant.go b/aws/resource_aws_kms_grant.go index c2a29d7b4f6..29041f23e12 100644 --- a/aws/resource_aws_kms_grant.go +++ b/aws/resource_aws_kms_grant.go @@ -163,7 +163,7 @@ func resourceAwsKmsGrantCreate(d *schema.ResourceData, meta interface{}) error { fmt.Errorf("[WARN] Error adding new KMS Grant for key: %s, retrying %s", *input.KeyId, err)) } - log.Printf("[ERROR] An error occured creating new AWS KMS Grant: %s", err) + log.Printf("[ERROR] An error occurred creating new AWS KMS Grant: %s", err) return resource.NonRetryableError(err) } return nil diff --git a/aws/resource_aws_lambda_permission.go b/aws/resource_aws_lambda_permission.go index 0ab996fc354..263c5959481 100644 --- a/aws/resource_aws_lambda_permission.go +++ b/aws/resource_aws_lambda_permission.go @@ -257,7 +257,7 @@ func resourceAwsLambdaPermissionRead(d *schema.ResourceData, meta interface{}) e } d.Set("action", statement.Action) - // Check if the pricipal is a cross-account IAM role + // Check if the principal is a cross-account IAM role if _, ok := statement.Principal["AWS"]; ok { d.Set("principal", statement.Principal["AWS"]) } else { diff --git a/aws/resource_aws_lightsail_instance.go b/aws/resource_aws_lightsail_instance.go index 6876b10b7cf..117223a9db9 100644 --- a/aws/resource_aws_lightsail_instance.go +++ b/aws/resource_aws_lightsail_instance.go @@ -149,7 +149,7 @@ func resourceAwsLightsailInstanceCreate(d *schema.ResourceData, meta interface{} _, err = stateConf.WaitForState() if err != nil { - // We don't return an error here because the Create call succeded + // We don't return an error here because the Create call succeeded log.Printf("[ERR] Error waiting for instance (%s) to become ready: %s", d.Id(), err) } diff --git a/aws/resource_aws_lightsail_key_pair.go b/aws/resource_aws_lightsail_key_pair.go index 1d4ac551738..af33dab7cb7 100644 --- a/aws/resource_aws_lightsail_key_pair.go +++ b/aws/resource_aws_lightsail_key_pair.go @@ -160,7 +160,7 @@ func resourceAwsLightsailKeyPairCreate(d *schema.ResourceData, meta interface{}) _, err := stateConf.WaitForState() if err != nil { - // We don't return an error here because the Create call succeded + // We don't return an error here because the Create call succeeded log.Printf("[ERR] Error waiting for KeyPair (%s) to become ready: %s", d.Id(), err) } diff --git a/aws/resource_aws_opsworks_rds_db_instance.go b/aws/resource_aws_opsworks_rds_db_instance.go index ef0d61f70fe..352dc082441 100644 --- a/aws/resource_aws_opsworks_rds_db_instance.go +++ b/aws/resource_aws_opsworks_rds_db_instance.go @@ -135,7 +135,7 @@ func resourceAwsOpsworksRdsDbInstanceRead(d *schema.ResourceData, meta interface StackId: aws.String(d.Get("stack_id").(string)), } - log.Printf("[DEBUG] Reading OpsWorks registerd rds db instances for stack: %s", d.Get("stack_id")) + log.Printf("[DEBUG] Reading OpsWorks registered rds db instances for stack: %s", d.Get("stack_id")) resp, err := client.DescribeRdsDbInstances(req) if err != nil { diff --git a/aws/resource_aws_route.go b/aws/resource_aws_route.go index ff1dc7e7cf0..bbd8a58e5ab 100644 --- a/aws/resource_aws_route.go +++ b/aws/resource_aws_route.go @@ -339,7 +339,7 @@ func resourceAwsRouteUpdate(d *schema.ResourceData, meta interface{}) error { } switch setTarget { - //instance_id is a special case due to the fact that AWS will "discover" the network_interace_id + //instance_id is a special case due to the fact that AWS will "discover" the network_interface_id //when it creates the route and return that data. In the case of an update, we should ignore the //existing network_interface_id case "instance_id": diff --git a/aws/resource_aws_security_group_rules_matching_test.go b/aws/resource_aws_security_group_rules_matching_test.go index aa36828f584..f6085534838 100644 --- a/aws/resource_aws_security_group_rules_matching_test.go +++ b/aws/resource_aws_security_group_rules_matching_test.go @@ -636,11 +636,11 @@ func TestRulesMixedMatching(t *testing.T) { // skip early if numExpectedSGs != numRemoteSGs { - log.Printf("\n\ncontinuning on numRemoteSGs \n\n") + log.Printf("\n\ncontinuing on numRemoteSGs \n\n") continue } if numExpectedCidrs != numRemoteCidrs { - log.Printf("\n\ncontinuning numRemoteCidrs\n\n") + log.Printf("\n\ncontinuing numRemoteCidrs\n\n") continue } diff --git a/aws/resource_aws_security_group_test.go b/aws/resource_aws_security_group_test.go index ebcf3058f42..8301b49589c 100644 --- a/aws/resource_aws_security_group_test.go +++ b/aws/resource_aws_security_group_test.go @@ -770,7 +770,7 @@ func testRemoveRuleCycle(primary, secondary *ec2.SecurityGroup) resource.TestChe } // This test should fail to destroy the Security Groups and VPC, due to a -// dependency cycle added outside of terraform's managment. There is a sweeper +// dependency cycle added outside of terraform's management. There is a sweeper // 'aws_vpc' and 'aws_security_group' that cleans these up, however, the test is // written to allow Terraform to clean it up because we do go and revoke the // cyclic rules that were added. @@ -837,7 +837,7 @@ func TestAccAWSSecurityGroup_forceRevokeRules_true(t *testing.T) { ), }, // Again try to apply the config with the sgs removed; it should work, - // because we've told the SGs to forecfully revoke their rules first + // because we've told the SGs to forcefully revoke their rules first { Config: testAccAWSSecurityGroupConfig_revoke_base_removed, }, diff --git a/aws/structure.go b/aws/structure.go index 924da6b901b..58f02791472 100644 --- a/aws/structure.go +++ b/aws/structure.go @@ -1811,7 +1811,7 @@ func flattenBeanstalkTrigger(list []*elasticbeanstalk.Trigger) []string { } // There are several parts of the AWS API that will sort lists of strings, -// causing diffs inbetween resources that use lists. This avoids a bit of +// causing diffs between resources that use lists. This avoids a bit of // code duplication for pre-sorts that can be used for things like hash // functions, etc. func sortInterfaceSlice(in []interface{}) []interface{} { @@ -4205,7 +4205,7 @@ func expandDynamoDbAttributes(cfg []interface{}) []*dynamodb.AttributeDefinition return attributes } -// TODO: Get rid of keySchemaM - the user should just explicitely define +// TODO: Get rid of keySchemaM - the user should just explicitly define // this in the config, we shouldn't magically be setting it like this. // Removal will however require config change, hence BC. :/ func expandDynamoDbLocalSecondaryIndexes(cfg []interface{}, keySchemaM map[string]interface{}) []*dynamodb.LocalSecondaryIndex { diff --git a/website/docs/r/codedeploy_deployment_group.html.markdown b/website/docs/r/codedeploy_deployment_group.html.markdown index 92ae2a6dc1c..f1d6fd5bb68 100644 --- a/website/docs/r/codedeploy_deployment_group.html.markdown +++ b/website/docs/r/codedeploy_deployment_group.html.markdown @@ -234,7 +234,7 @@ You can configure how instances will be added to the replacement environment in * `action` - (Optional) The method used to add instances to a replacement environment. * `DISCOVER_EXISTING`: Use instances that already exist or will be created manually. - * `COPY_AUTO_SCALING_GROUP`: Use settings from a specified **Auto Scaling** group to define and create instances in a new Auto Scaling group. _Exactly one Auto Scaling group must be specifed_ when selecting `COPY_AUTO_SCALING_GROUP`. Use `autoscaling_groups` to specify the Auto Scaling group. + * `COPY_AUTO_SCALING_GROUP`: Use settings from a specified **Auto Scaling** group to define and create instances in a new Auto Scaling group. _Exactly one Auto Scaling group must be specified_ when selecting `COPY_AUTO_SCALING_GROUP`. Use `autoscaling_groups` to specify the Auto Scaling group. You can configure how instances in the original environment are terminated when a blue/green deployment is successful. `terminate_blue_instances_on_deployment_success` supports the following: diff --git a/website/docs/r/config_configuration_aggregator.html.markdown b/website/docs/r/config_configuration_aggregator.html.markdown index 8f7a1583646..33fa1cf1dce 100644 --- a/website/docs/r/config_configuration_aggregator.html.markdown +++ b/website/docs/r/config_configuration_aggregator.html.markdown @@ -89,7 +89,7 @@ Either `regions` or `all_regions` (as true) must be specified. * `all_regions` - (Optional) If true, aggregate existing AWS Config regions and future regions. * `regions` - (Optional) List of source regions being aggregated. -* `role_arn` - (Required) ARN of the IAM role used to retreive AWS Organization details associated with the aggregator account. +* `role_arn` - (Required) ARN of the IAM role used to retrieve AWS Organization details associated with the aggregator account. Either `regions` or `all_regions` (as true) must be specified. diff --git a/website/docs/r/db_instance.html.markdown b/website/docs/r/db_instance.html.markdown index 3c467ad1fe0..d3f70bf08af 100644 --- a/website/docs/r/db_instance.html.markdown +++ b/website/docs/r/db_instance.html.markdown @@ -90,7 +90,7 @@ be created in the `default` VPC, or in EC2 Classic, if available. When working with read replicas, it needs to be specified only if the source database specifies an instance in another AWS Region. See [DBSubnetGroupName in API action CreateDBInstanceReadReplica](https://docs.aws.amazon.com/AmazonRDS/latest/APIReference/API_CreateDBInstanceReadReplica.html) -for additonal read replica contraints. +for additional read replica contraints. * `domain` - (Optional) The ID of the Directory Service Active Directory domain to create the instance in. * `domain_iam_role_name` - (Optional, but required if domain is provided) The name of the IAM role to be used when making API calls to the Directory Service. * `enabled_cloudwatch_logs_exports` - (Optional) List of log types to enable for exporting to CloudWatch logs. If omitted, no logs will be exported. Valid values (depending on `engine`): `alert`, `audit`, `error`, `general`, `listener`, `slowquery`, `trace`. diff --git a/website/docs/r/emr_security_configuration.html.markdown b/website/docs/r/emr_security_configuration.html.markdown index 856fe93df5a..c77cab53c24 100644 --- a/website/docs/r/emr_security_configuration.html.markdown +++ b/website/docs/r/emr_security_configuration.html.markdown @@ -1,6 +1,6 @@ --- layout: "aws" -page_title: "AWS: aws_emr_security_configuraiton" +page_title: "AWS: aws_emr_security_configuration" sidebar_current: "docs-aws-resource-emr-security-configuration" description: |- Provides a resource to manage AWS EMR Security Configurations diff --git a/website/docs/r/lightsail_key_pair.html.markdown b/website/docs/r/lightsail_key_pair.html.markdown index 00b25ae7c62..68c2151fb38 100644 --- a/website/docs/r/lightsail_key_pair.html.markdown +++ b/website/docs/r/lightsail_key_pair.html.markdown @@ -9,7 +9,7 @@ description: |- # aws_lightsail_key_pair Provides a Lightsail Key Pair, for use with Lightsail Instances. These key pairs -are seperate from EC2 Key Pairs, and must be created or imported for use with +are separate from EC2 Key Pairs, and must be created or imported for use with Lightsail. ~> **Note:** Lightsail is currently only supported in a limited number of AWS Regions, please see ["Regions and Availability Zones in Amazon Lightsail"](https://lightsail.aws.amazon.com/ls/docs/overview/article/understanding-regions-and-availability-zones-in-amazon-lightsail) for more details diff --git a/website/docs/r/ssm_activation.html.markdown b/website/docs/r/ssm_activation.html.markdown index dfff5fff9ba..dd09bcd3632 100644 --- a/website/docs/r/ssm_activation.html.markdown +++ b/website/docs/r/ssm_activation.html.markdown @@ -46,7 +46,7 @@ resource "aws_ssm_activation" "foo" { The following arguments are supported: -* `name` - (Optional) The default name of the registerd managed instance. +* `name` - (Optional) The default name of the registered managed instance. * `description` - (Optional) The description of the resource that you want to register. * `expiration_date` - (Optional) A timestamp in [RFC3339 format](https://tools.ietf.org/html/rfc3339#section-5.8) by which this activation request should expire. The default value is 24 hours from resource creation time. * `iam_role` - (Required) The IAM Role to attach to the managed instance. @@ -57,7 +57,7 @@ The following arguments are supported: In addition to all arguments above, the following attributes are exported: * `activation_code` - The code the system generates when it processes the activation. -* `name` - The default name of the registerd managed instance. +* `name` - The default name of the registered managed instance. * `description` - The description of the resource that was registered. * `expired` - If the current activation has expired. * `expiration_date` - The date by which this activation request should expire. The default value is 24 hours. From 8fde9be7517a676d006619ae6700967c813cedb5 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Mon, 10 Sep 2018 09:46:45 -0400 Subject: [PATCH 094/184] provider: Fix and enable varcheck linting ``` $ make lint ==> Checking source code against linters... $ make test TEST=./aws ==> Checking that code complies with gofmt requirements... go test ./aws -timeout=30s -parallel=4 ok github.com/terraform-providers/terraform-provider-aws/aws 2.574s $ make testacc TEST=./aws TESTARGS='-run=TestAccAWSAccessKey_encrypted' ==> Checking that code complies with gofmt requirements... TF_ACC=1 go test ./aws -v -run=TestAccAWSAccessKey_encrypted -timeout 120m === RUN TestAccAWSAccessKey_encrypted --- PASS: TestAccAWSAccessKey_encrypted (9.11s) PASS ok github.com/terraform-providers/terraform-provider-aws/aws 9.810s ``` --- .gometalinter.json | 1 + ...ta_source_aws_vpc_endpoint_service_test.go | 10 --- aws/resource_aws_elb_test.go | 14 ---- aws/resource_aws_iam_access_key_test.go | 79 +------------------ aws/resource_aws_route53_record_test.go | 60 -------------- aws/resource_aws_route_test.go | 33 -------- 6 files changed, 2 insertions(+), 195 deletions(-) diff --git a/.gometalinter.json b/.gometalinter.json index b7916fd9fb4..f88bb197212 100644 --- a/.gometalinter.json +++ b/.gometalinter.json @@ -5,6 +5,7 @@ "gofmt", "interfacer", "structcheck", + "varcheck", "vet" ], "EnableGC": true, diff --git a/aws/data_source_aws_vpc_endpoint_service_test.go b/aws/data_source_aws_vpc_endpoint_service_test.go index ddc072dd5cf..842afe501c6 100644 --- a/aws/data_source_aws_vpc_endpoint_service_test.go +++ b/aws/data_source_aws_vpc_endpoint_service_test.go @@ -135,16 +135,6 @@ data "aws_vpc_endpoint_service" "ec2" { } ` -const testAccDataSourceAwsVpcEndpointServiceConfig_custom = ` -provider "aws" { - region = "us-west-2" -} - -data "aws_vpc_endpoint_service" "ec2" { - service = "ec2" -} -` - func testAccDataSourceAwsVpcEndpointServiceCustomConfig(lbName string) string { return fmt.Sprintf( ` diff --git a/aws/resource_aws_elb_test.go b/aws/resource_aws_elb_test.go index e0d3c38a443..01bee4eeb21 100644 --- a/aws/resource_aws_elb_test.go +++ b/aws/resource_aws_elb_test.go @@ -1395,20 +1395,6 @@ resource "aws_instance" "foo" { } ` -const testAccAWSELBConfigListenerSSLCertificateId = ` -resource "aws_elb" "bar" { - availability_zones = ["us-west-2a"] - - listener { - instance_port = 8000 - instance_protocol = "http" - ssl_certificate_id = "%s" - lb_port = 443 - lb_protocol = "https" - } -} -` - const testAccAWSELBConfigHealthCheck = ` resource "aws_elb" "bar" { availability_zones = ["us-west-2a", "us-west-2b", "us-west-2c"] diff --git a/aws/resource_aws_iam_access_key_test.go b/aws/resource_aws_iam_access_key_test.go index 3912868cd64..ec7e7584429 100644 --- a/aws/resource_aws_iam_access_key_test.go +++ b/aws/resource_aws_iam_access_key_test.go @@ -46,7 +46,7 @@ func TestAccAWSAccessKey_encrypted(t *testing.T) { CheckDestroy: testAccCheckAWSAccessKeyDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSAccessKeyConfig_encrypted(rName, testPubAccessKey1), + Config: testAccAWSAccessKeyConfig_encrypted(rName, testPubKey1), Check: resource.ComposeTestCheckFunc( testAccCheckAWSAccessKeyExists("aws_iam_access_key.a_key", &conf), testAccCheckAWSAccessKeyAttributes(&conf), @@ -207,80 +207,3 @@ func TestSesSmtpPasswordFromSecretKey(t *testing.T) { } } } - -const testPubAccessKey1 = `mQENBFXbjPUBCADjNjCUQwfxKL+RR2GA6pv/1K+zJZ8UWIF9S0lk7cVIEfJiprzzwiMwBS5cD0da -rGin1FHvIWOZxujA7oW0O2TUuatqI3aAYDTfRYurh6iKLC+VS+F7H+/mhfFvKmgr0Y5kDCF1j0T/ -063QZ84IRGucR/X43IY7kAtmxGXH0dYOCzOe5UBX1fTn3mXGe2ImCDWBH7gOViynXmb6XNvXkP0f -sF5St9jhO7mbZU9EFkv9O3t3EaURfHopsCVDOlCkFCw5ArY+DUORHRzoMX0PnkyQb5OzibkChzpg -8hQssKeVGpuskTdz5Q7PtdW71jXd4fFVzoNH8fYwRpziD2xNvi6HABEBAAG0EFZhdWx0IFRlc3Qg -S2V5IDGJATgEEwECACIFAlXbjPUCGy8GCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEOfLr44B -HbeTo+sH/i7bapIgPnZsJ81hmxPj4W12uvunksGJiC7d4hIHsG7kmJRTJfjECi+AuTGeDwBy84TD -cRaOB6e79fj65Fg6HgSahDUtKJbGxj/lWzmaBuTzlN3CEe8cMwIPqPT2kajJVdOyrvkyuFOdPFOE -A7bdCH0MqgIdM2SdF8t40k/ATfuD2K1ZmumJ508I3gF39jgTnPzD4C8quswrMQ3bzfvKC3klXRlB -C0yoArn+0QA3cf2B9T4zJ2qnvgotVbeK/b1OJRNj6Poeo+SsWNc/A5mw7lGScnDgL3yfwCm1gQXa -QKfOt5x+7GqhWDw10q+bJpJlI10FfzAnhMF9etSqSeURBRW5AQ0EVduM9QEIAL53hJ5bZJ7oEDCn -aY+SCzt9QsAfnFTAnZJQrvkvusJzrTQ088eUQmAjvxkfRqnv981fFwGnh2+I1Ktm698UAZS9Jt8y -jak9wWUICKQO5QUt5k8cHwldQXNXVXFa+TpQWQR5yW1a9okjh5o/3d4cBt1yZPUJJyLKY43Wvptb -6EuEsScO2DnRkh5wSMDQ7dTooddJCmaq3LTjOleRFQbu9ij386Do6jzK69mJU56TfdcydkxkWF5N -ZLGnED3lq+hQNbe+8UI5tD2oP/3r5tXKgMy1R/XPvR/zbfwvx4FAKFOP01awLq4P3d/2xOkMu4Lu -9p315E87DOleYwxk+FoTqXEAEQEAAYkCPgQYAQIACQUCVduM9QIbLgEpCRDny6+OAR23k8BdIAQZ -AQIABgUCVduM9QAKCRAID0JGyHtSGmqYB/4m4rJbbWa7dBJ8VqRU7ZKnNRDR9CVhEGipBmpDGRYu -lEimOPzLUX/ZXZmTZzgemeXLBaJJlWnopVUWuAsyjQuZAfdd8nHkGRHG0/DGum0l4sKTta3OPGHN -C1z1dAcQ1RCr9bTD3PxjLBczdGqhzw71trkQRBRdtPiUchltPMIyjUHqVJ0xmg0hPqFic0fICsr0 -YwKoz3h9+QEcZHvsjSZjgydKvfLYcm+4DDMCCqcHuJrbXJKUWmJcXR0y/+HQONGrGJ5xWdO+6eJi -oPn2jVMnXCm4EKc7fcLFrz/LKmJ8seXhxjM3EdFtylBGCrx3xdK0f+JDNQaC/rhUb5V2XuX6VwoH -/AtY+XsKVYRfNIupLOUcf/srsm3IXT4SXWVomOc9hjGQiJ3rraIbADsc+6bCAr4XNZS7moViAAcI -PXFv3m3WfUlnG/om78UjQqyVACRZqqAGmuPq+TSkRUCpt9h+A39LQWkojHqyob3cyLgy6z9Q557O -9uK3lQozbw2gH9zC0RqnePl+rsWIUU/ga16fH6pWc1uJiEBt8UZGypQ/E56/343epmYAe0a87sHx -8iDV+dNtDVKfPRENiLOOc19MmS+phmUyrbHqI91c0pmysYcJZCD3a502X1gpjFbPZcRtiTmGnUKd -OIu60YPNE4+h7u2CfYyFPu3AlUaGNMBlvy6PEpU=` - -const testPrivAccessKey1 = `lQOYBFXbjPUBCADjNjCUQwfxKL+RR2GA6pv/1K+zJZ8UWIF9S0lk7cVIEfJiprzzwiMwBS5cD0da -rGin1FHvIWOZxujA7oW0O2TUuatqI3aAYDTfRYurh6iKLC+VS+F7H+/mhfFvKmgr0Y5kDCF1j0T/ -063QZ84IRGucR/X43IY7kAtmxGXH0dYOCzOe5UBX1fTn3mXGe2ImCDWBH7gOViynXmb6XNvXkP0f -sF5St9jhO7mbZU9EFkv9O3t3EaURfHopsCVDOlCkFCw5ArY+DUORHRzoMX0PnkyQb5OzibkChzpg -8hQssKeVGpuskTdz5Q7PtdW71jXd4fFVzoNH8fYwRpziD2xNvi6HABEBAAEAB/wL+KX0mdeISEpX -oDgt766Key1Kthe8nbEs5dOXIsP7OR7ZPcnE2hy6gftgVFnBGEZnWVN70vmJd6Z5y9d1mI+GecXj -UL0EpI0EmohyYDJsHUnght/5ecRNFA+VeNmGPYNQGCeHJyZOiFunGGENpHU7BbubAht8delz37Mx -JQgvMyR6AKvg8HKBoQeqV1uMWNJE/vKwV/z1dh1sjK/GFxu05Qaq0GTfAjVLuFOyJTS95yq6gblD -jUdbHLp7tBeqIKo9voWCJF5mGOlq3973vVoWETy9b0YYPCE/M7fXmK9dJITHqkROLMW6TgcFeIw4 -yL5KOBCHk+QGPSvyQN7R7Fd5BADwuT1HZmvg7Y9GjarKXDjxdNemUiHtba2rUzfH6uNmKNQvwQek -nma5palNUJ4/dz1aPB21FUBXJF5yWwXEdApl+lIDU0J5m4UD26rqEVRq9Kx3GsX+yfcwObkrSzW6 -kmnQSB5KI0fIuegMTM+Jxo3pB/mIRwDTMmk+vfzIGyW+7QQA8aFwFLMdKdfLgSGbl5Z6etmOAVQ2 -Oe2ebegU9z/ewi/Rdt2s9yQiAdGVM8+q15Saz8a+kyS/l1CjNPzr3VpYx1OdZ3gb7i2xoy9GdMYR -ZpTq3TuST95kx/9DqA97JrP23G47U0vwF/cg8ixCYF8Fz5dG4DEsxgMwKqhGdW58wMMD/iytkfMk -Vk6Z958Rpy7lhlC6L3zpO38767bSeZ8gRRi/NMFVOSGYepKFarnfxcTiNa+EoSVA6hUo1N64nALE -sJBpyOoTfKIpz7WwTF1+WogkiYrfM6lHon1+3qlziAcRW0IohM3g2C1i3GWdON4Cl8/PDO3R0E52 -N6iG/ctNNeMiPe60EFZhdWx0IFRlc3QgS2V5IDGJATgEEwECACIFAlXbjPUCGy8GCwkIBwMCBhUI -AgkKCwQWAgMBAh4BAheAAAoJEOfLr44BHbeTo+sH/i7bapIgPnZsJ81hmxPj4W12uvunksGJiC7d -4hIHsG7kmJRTJfjECi+AuTGeDwBy84TDcRaOB6e79fj65Fg6HgSahDUtKJbGxj/lWzmaBuTzlN3C -Ee8cMwIPqPT2kajJVdOyrvkyuFOdPFOEA7bdCH0MqgIdM2SdF8t40k/ATfuD2K1ZmumJ508I3gF3 -9jgTnPzD4C8quswrMQ3bzfvKC3klXRlBC0yoArn+0QA3cf2B9T4zJ2qnvgotVbeK/b1OJRNj6Poe -o+SsWNc/A5mw7lGScnDgL3yfwCm1gQXaQKfOt5x+7GqhWDw10q+bJpJlI10FfzAnhMF9etSqSeUR -BRWdA5gEVduM9QEIAL53hJ5bZJ7oEDCnaY+SCzt9QsAfnFTAnZJQrvkvusJzrTQ088eUQmAjvxkf -Rqnv981fFwGnh2+I1Ktm698UAZS9Jt8yjak9wWUICKQO5QUt5k8cHwldQXNXVXFa+TpQWQR5yW1a -9okjh5o/3d4cBt1yZPUJJyLKY43Wvptb6EuEsScO2DnRkh5wSMDQ7dTooddJCmaq3LTjOleRFQbu -9ij386Do6jzK69mJU56TfdcydkxkWF5NZLGnED3lq+hQNbe+8UI5tD2oP/3r5tXKgMy1R/XPvR/z -bfwvx4FAKFOP01awLq4P3d/2xOkMu4Lu9p315E87DOleYwxk+FoTqXEAEQEAAQAH+wVyQXaNwnjQ -xfW+M8SJNo0C7e+0d7HsuBTA/d/eP4bj6+X8RaRFVwiMvSAoxsqBNCLJP00qzzKfRQWJseD1H35z -UjM7rNVUEL2k1yppyp61S0qj0TdhVUfJDYZqRYonVgRMvzfDTB1ryKrefKenQYL/jGd9VYMnKmWZ -6GVk4WWXXx61iOt2HNcmSXKetMM1Mg67woPZkA3fJaXZ+zW0zMu4lTSB7yl3+vLGIFYILkCFnREr -drQ+pmIMwozUAt+pBq8dylnkHh6g/FtRfWmLIMDqM1NlyuHRp3dyLDFdTA93osLG0QJblfX54W34 -byX7a4HASelGi3nPjjOAsTFDkuEEANV2viaWk1CV4ryDrXGmy4Xo32Md+laGPRcVfbJ0mjZjhQsO -gWC1tjMs1qZMPhcrKIBCjjdAcAIrGV9h3CXc0uGuez4XxLO+TPBKaS0B8rKhnKph1YZuf+HrOhzS -astDnOjNIT+qucCL/qSbdYpj9of3yY61S59WphPOBjoVM3BFBADka6ZCk81gx8jA2E1e9UqQDmdM -FZaVA1E7++kqVSFRDJGnq+5GrBTwCJ+sevi+Rvf8Nx4AXvpCdtMBPX9RogsUFcR0pMrKBrgRo/Vg -EpuodY2Ef1VtqXR24OxtRf1UwvHKydIsU05rzMAy5uGgQvTzRTXxZFLGUY31wjWqmo9VPQP+PnwA -K83EV2kk2bsXwZ9MXg05iXqGQYR4bEc/12v04BtaNaDS53hBDO4JIa3Bnz+5oUoYhb8FgezUKA9I -n6RdKTTP1BLAu8titeozpNF07V++dPiSE2wrIVsaNHL1pUwW0ql50titVwe+EglWiCKPtJBcCPUA -3oepSPchiDjPqrNCYIkCPgQYAQIACQUCVduM9QIbLgEpCRDny6+OAR23k8BdIAQZAQIABgUCVduM -9QAKCRAID0JGyHtSGmqYB/4m4rJbbWa7dBJ8VqRU7ZKnNRDR9CVhEGipBmpDGRYulEimOPzLUX/Z -XZmTZzgemeXLBaJJlWnopVUWuAsyjQuZAfdd8nHkGRHG0/DGum0l4sKTta3OPGHNC1z1dAcQ1RCr -9bTD3PxjLBczdGqhzw71trkQRBRdtPiUchltPMIyjUHqVJ0xmg0hPqFic0fICsr0YwKoz3h9+QEc -ZHvsjSZjgydKvfLYcm+4DDMCCqcHuJrbXJKUWmJcXR0y/+HQONGrGJ5xWdO+6eJioPn2jVMnXCm4 -EKc7fcLFrz/LKmJ8seXhxjM3EdFtylBGCrx3xdK0f+JDNQaC/rhUb5V2XuX6VwoH/AtY+XsKVYRf -NIupLOUcf/srsm3IXT4SXWVomOc9hjGQiJ3rraIbADsc+6bCAr4XNZS7moViAAcIPXFv3m3WfUln -G/om78UjQqyVACRZqqAGmuPq+TSkRUCpt9h+A39LQWkojHqyob3cyLgy6z9Q557O9uK3lQozbw2g -H9zC0RqnePl+rsWIUU/ga16fH6pWc1uJiEBt8UZGypQ/E56/343epmYAe0a87sHx8iDV+dNtDVKf -PRENiLOOc19MmS+phmUyrbHqI91c0pmysYcJZCD3a502X1gpjFbPZcRtiTmGnUKdOIu60YPNE4+h -7u2CfYyFPu3AlUaGNMBlvy6PEpU=` diff --git a/aws/resource_aws_route53_record_test.go b/aws/resource_aws_route53_record_test.go index 7811a77b7da..3fd2eddee9b 100644 --- a/aws/resource_aws_route53_record_test.go +++ b/aws/resource_aws_route53_record_test.go @@ -677,34 +677,6 @@ resource "aws_route53_record" "default" { } ` -const testAccRoute53RecordConfigCNAMERecord = ` -resource "aws_route53_zone" "main" { - name = "notexample.com" -} - -resource "aws_route53_record" "default" { - zone_id = "${aws_route53_zone.main.zone_id}" - name = "host123.domain" - type = "CNAME" - ttl = "30" - records = ["1.2.3.4"] -} -` - -const testAccRoute53RecordConfigCNAMERecordUpdateToCNAME = ` -resource "aws_route53_zone" "main" { - name = "notexample.com" -} - -resource "aws_route53_record" "default" { - zone_id = "${aws_route53_zone.main.zone_id}" - name = "host123.domain" - type = "A" - ttl = "30" - records = ["1.2.3.4"] -} -` - const testAccRoute53RecordConfig_fqdn = ` resource "aws_route53_zone" "main" { name = "notexample.com" @@ -741,12 +713,6 @@ resource "aws_route53_record" "default" { } ` -const testAccRoute53RecordNoConfig = ` -resource "aws_route53_zone" "main" { - name = "notexample.com" -} -` - const testAccRoute53RecordConfigSuffix = ` resource "aws_route53_zone" "main" { name = "notexample.com" @@ -1088,32 +1054,6 @@ resource "aws_elb" "main" { } ` -const testAccRoute53AliasRecord = ` -resource "aws_route53_zone" "main" { - name = "notexample.com" -} - -resource "aws_route53_record" "origin" { - zone_id = "${aws_route53_zone.main.zone_id}" - name = "origin" - type = "A" - ttl = 5 - records = ["127.0.0.1"] -} - -resource "aws_route53_record" "alias" { - zone_id = "${aws_route53_zone.main.zone_id}" - name = "www" - type = "A" - - alias { - zone_id = "${aws_route53_zone.main.zone_id}" - name = "${aws_route53_record.origin.name}.${aws_route53_zone.main.name}" - evaluate_target_health = true - } -} -` - const testAccRoute53S3AliasRecord = ` resource "aws_route53_zone" "main" { name = "notexample.com" diff --git a/aws/resource_aws_route_test.go b/aws/resource_aws_route_test.go index 0ac00f3ca10..b0c50247d04 100644 --- a/aws/resource_aws_route_test.go +++ b/aws/resource_aws_route_test.go @@ -803,39 +803,6 @@ resource "aws_route" "bar" { } `) -// Acceptance test if mixed inline and external routes are implemented -var testAccAWSRouteMixConfig = fmt.Sprint(` -resource "aws_vpc" "foo" { - cidr_block = "10.1.0.0/16" - tags { - Name = "terraform-testacc-route-route-mix" - } -} - -resource "aws_internet_gateway" "foo" { - vpc_id = "${aws_vpc.foo.id}" - - tags { - Name = "terraform-testacc-route-route-mix" - } -} - -resource "aws_route_table" "foo" { - vpc_id = "${aws_vpc.foo.id}" - - route { - cidr_block = "10.2.0.0/16" - gateway_id = "${aws_internet_gateway.foo.id}" - } -} - -resource "aws_route" "bar" { - route_table_id = "${aws_route_table.foo.id}" - destination_cidr_block = "0.0.0.0/0" - gateway_id = "${aws_internet_gateway.foo.id}" -} -`) - var testAccAWSRouteNoopChange = fmt.Sprint(` resource "aws_vpc" "test" { cidr_block = "10.10.0.0/16" From 40237ca9f4165ce0acb09865287b41c49d3d097e Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Mon, 10 Sep 2018 10:14:33 -0400 Subject: [PATCH 095/184] provider: Fix and enable unconvert linting ``` $ make lint ==> Checking source code against linters... $ make test TEST=./aws ==> Checking that code complies with gofmt requirements... go test ./aws -timeout=30s -parallel=4 ok github.com/terraform-providers/terraform-provider-aws/aws 2.646s ``` --- .gometalinter.json | 1 + aws/data_source_aws_kms_secret.go | 2 +- aws/data_source_aws_kms_secrets.go | 2 +- aws/resource_aws_elastic_beanstalk_environment.go | 2 +- aws/resource_aws_opsworks_application.go | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gometalinter.json b/.gometalinter.json index b7916fd9fb4..a11f01dc9e4 100644 --- a/.gometalinter.json +++ b/.gometalinter.json @@ -5,6 +5,7 @@ "gofmt", "interfacer", "structcheck", + "unconvert", "vet" ], "EnableGC": true, diff --git a/aws/data_source_aws_kms_secret.go b/aws/data_source_aws_kms_secret.go index caac9000159..16772633e52 100644 --- a/aws/data_source_aws_kms_secret.go +++ b/aws/data_source_aws_kms_secret.go @@ -70,7 +70,7 @@ func dataSourceAwsKmsSecretRead(d *schema.ResourceData, meta interface{}) error // build the kms decrypt params params := &kms.DecryptInput{ - CiphertextBlob: []byte(payload), + CiphertextBlob: payload, } if context, exists := secret["context"]; exists { params.EncryptionContext = make(map[string]*string) diff --git a/aws/data_source_aws_kms_secrets.go b/aws/data_source_aws_kms_secrets.go index 97b62272201..63caf704130 100644 --- a/aws/data_source_aws_kms_secrets.go +++ b/aws/data_source_aws_kms_secrets.go @@ -72,7 +72,7 @@ func dataSourceAwsKmsSecretsRead(d *schema.ResourceData, meta interface{}) error // build the kms decrypt params params := &kms.DecryptInput{ - CiphertextBlob: []byte(payload), + CiphertextBlob: payload, } if context, exists := secret["context"]; exists { params.EncryptionContext = make(map[string]*string) diff --git a/aws/resource_aws_elastic_beanstalk_environment.go b/aws/resource_aws_elastic_beanstalk_environment.go index 19aa4dffaef..796ece82f12 100644 --- a/aws/resource_aws_elastic_beanstalk_environment.go +++ b/aws/resource_aws_elastic_beanstalk_environment.go @@ -980,7 +980,7 @@ func getBeanstalkEnvironmentErrors(conn *elasticbeanstalk.ElasticBeanstalk, envi } events = append(events, e) } - sort.Sort(beanstalkEnvironmentErrors(events)) + sort.Sort(events) var result *multierror.Error for _, event := range events { diff --git a/aws/resource_aws_opsworks_application.go b/aws/resource_aws_opsworks_application.go index 939d2fef491..bfa11fa1b7b 100644 --- a/aws/resource_aws_opsworks_application.go +++ b/aws/resource_aws_opsworks_application.go @@ -415,7 +415,7 @@ func resourceAwsOpsworksSetApplicationEnvironmentVariable(d *schema.ResourceData } if config.Secure != nil { - if bool(*config.Secure) { + if aws.BoolValue(config.Secure) { data["secure"] = &opsworksTrueString } else { data["secure"] = &opsworksFalseString From 12d26526ce293649978c98c5a178bf7f3d63f8ba Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Mon, 10 Sep 2018 10:58:54 -0400 Subject: [PATCH 096/184] provider: Fix and enable ineffassign linting ``` $ make lint ==> Checking source code against linters... $ make test TEST=./aws ==> Checking that code complies with gofmt requirements... go test ./aws -timeout=30s -parallel=4 ok github.com/terraform-providers/terraform-provider-aws/aws 2.444s ``` --- .gometalinter.json | 1 + ...nt_distribution_configuration_structure.go | 3 +-- aws/network_acl_entry.go | 4 +--- aws/resource_aws_acm_certificate.go | 3 +++ aws/resource_aws_autoscaling_group_waiting.go | 3 +++ aws/resource_aws_db_parameter_group.go | 2 +- ...stic_beanstalk_environment_migrate_test.go | 2 +- ...esource_aws_elasticache_parameter_group.go | 4 ++-- ...sticache_replication_group_migrate_test.go | 2 +- aws/resource_aws_elb.go | 3 +++ aws/resource_aws_instance.go | 6 +++++ aws/resource_aws_instance_migrate_test.go | 2 +- ...s_firehose_delivery_stream_migrate_test.go | 2 +- aws/resource_aws_load_balancer_policy.go | 3 +++ ...rce_aws_neptune_cluster_parameter_group.go | 2 +- aws/resource_aws_neptune_parameter_group.go | 4 ++-- aws/resource_aws_rds_cluster.go | 22 ++++++++----------- ...esource_aws_rds_cluster_parameter_group.go | 2 +- aws/resource_aws_s3_bucket_inventory.go | 3 +++ aws/resource_aws_security_group.go | 4 +--- ...esource_aws_security_group_migrate_test.go | 2 +- aws/resource_aws_ssm_document.go | 4 +--- aws/resource_aws_volume_attachment_test.go | 5 ++++- aws/resource_aws_waf_regex_match_set_test.go | 5 ++++- aws/resource_aws_waf_rule_group.go | 3 +++ aws/resource_aws_waf_rule_group_test.go | 3 +++ ...ce_aws_wafregional_regex_match_set_test.go | 5 ++++- aws/resource_aws_wafregional_rule_group.go | 3 +++ ...esource_aws_wafregional_rule_group_test.go | 3 +++ 29 files changed, 71 insertions(+), 39 deletions(-) diff --git a/.gometalinter.json b/.gometalinter.json index b7916fd9fb4..98f215dc958 100644 --- a/.gometalinter.json +++ b/.gometalinter.json @@ -3,6 +3,7 @@ "Enable": [ "errcheck", "gofmt", + "ineffassign", "interfacer", "structcheck", "vet" diff --git a/aws/cloudfront_distribution_configuration_structure.go b/aws/cloudfront_distribution_configuration_structure.go index 55bdd3509d5..a950ccdf7b0 100644 --- a/aws/cloudfront_distribution_configuration_structure.go +++ b/aws/cloudfront_distribution_configuration_structure.go @@ -195,11 +195,10 @@ func expandDefaultCacheBehavior(m map[string]interface{}) *cloudfront.DefaultCac } func flattenDefaultCacheBehavior(dcb *cloudfront.DefaultCacheBehavior) *schema.Set { - m := make(map[string]interface{}) var cb cloudfront.CacheBehavior simpleCopyStruct(dcb, &cb) - m = flattenCacheBehaviorDeprecated(&cb) + m := flattenCacheBehaviorDeprecated(&cb) return schema.NewSet(defaultCacheBehaviorHash, []interface{}{m}) } diff --git a/aws/network_acl_entry.go b/aws/network_acl_entry.go index 5b92c8d9f32..ee76ca3e0f1 100644 --- a/aws/network_acl_entry.go +++ b/aws/network_acl_entry.go @@ -96,8 +96,7 @@ func protocolStrings(protocolIntegers map[string]int) map[int]string { } func protocolIntegers() map[string]int { - var protocolIntegers = make(map[string]int) - protocolIntegers = map[string]int{ + return map[string]int{ // defined at https://www.iana.org/assignments/protocol-numbers/protocol-numbers.xhtml "all": -1, "hopopt": 0, @@ -245,7 +244,6 @@ func protocolIntegers() map[string]int { "253": 253, "254": 254, } - return protocolIntegers } // expectedPortPair stores a pair of ports we expect to see together. diff --git a/aws/resource_aws_acm_certificate.go b/aws/resource_aws_acm_certificate.go index 14beef1d3f7..db49e7d0973 100644 --- a/aws/resource_aws_acm_certificate.go +++ b/aws/resource_aws_acm_certificate.go @@ -156,6 +156,9 @@ func resourceAwsAcmCertificateRead(d *schema.ResourceData, meta interface{}) err } tagResp, err := acmconn.ListTagsForCertificate(params) + if err != nil { + return resource.NonRetryableError(fmt.Errorf("error listing tags for certificate (%s): %s", d.Id(), err)) + } if err := d.Set("tags", tagsToMapACM(tagResp.Tags)); err != nil { return resource.NonRetryableError(err) } diff --git a/aws/resource_aws_autoscaling_group_waiting.go b/aws/resource_aws_autoscaling_group_waiting.go index daa8faa8aae..80b1f90e9c3 100644 --- a/aws/resource_aws_autoscaling_group_waiting.go +++ b/aws/resource_aws_autoscaling_group_waiting.go @@ -46,6 +46,9 @@ func waitForASGCapacity( return nil } elbis, err := getELBInstanceStates(g, meta) + if err != nil { + return resource.NonRetryableError(err) + } albis, err := getTargetGroupInstanceStates(g, meta) if err != nil { return resource.NonRetryableError(err) diff --git a/aws/resource_aws_db_parameter_group.go b/aws/resource_aws_db_parameter_group.go index faafcb3583b..e95d0b4d4ed 100644 --- a/aws/resource_aws_db_parameter_group.go +++ b/aws/resource_aws_db_parameter_group.go @@ -276,7 +276,7 @@ func resourceAwsDbParameterGroupUpdate(d *schema.ResourceData, meta interface{}) // we've got them all. maxParams := 20 for parameters != nil { - paramsToModify := make([]*rds.Parameter, 0) + var paramsToModify []*rds.Parameter if len(parameters) <= maxParams { paramsToModify, parameters = parameters[:], nil } else { diff --git a/aws/resource_aws_elastic_beanstalk_environment_migrate_test.go b/aws/resource_aws_elastic_beanstalk_environment_migrate_test.go index 6b7603894bb..37c104e7092 100644 --- a/aws/resource_aws_elastic_beanstalk_environment_migrate_test.go +++ b/aws/resource_aws_elastic_beanstalk_environment_migrate_test.go @@ -47,7 +47,7 @@ func TestAWSElasticBeanstalkEnvironmentMigrateState(t *testing.T) { ID: "e-abcde12345", Attributes: tc.Attributes, } - is, err := resourceAwsElasticBeanstalkEnvironmentMigrateState( + _, err := resourceAwsElasticBeanstalkEnvironmentMigrateState( tc.StateVersion, is, tc.Meta) if err != nil { diff --git a/aws/resource_aws_elasticache_parameter_group.go b/aws/resource_aws_elasticache_parameter_group.go index 6bf249c5584..3b7b2f4caf9 100644 --- a/aws/resource_aws_elasticache_parameter_group.go +++ b/aws/resource_aws_elasticache_parameter_group.go @@ -166,7 +166,7 @@ func resourceAwsElasticacheParameterGroupUpdate(d *schema.ResourceData, meta int maxParams := 20 for len(toRemove) > 0 { - paramsToModify := make([]*elasticache.ParameterNameValue, 0) + var paramsToModify []*elasticache.ParameterNameValue if len(toRemove) <= maxParams { paramsToModify, toRemove = toRemove[:], nil } else { @@ -194,7 +194,7 @@ func resourceAwsElasticacheParameterGroupUpdate(d *schema.ResourceData, meta int } for len(toAdd) > 0 { - paramsToModify := make([]*elasticache.ParameterNameValue, 0) + var paramsToModify []*elasticache.ParameterNameValue if len(toAdd) <= maxParams { paramsToModify, toAdd = toAdd[:], nil } else { diff --git a/aws/resource_aws_elasticache_replication_group_migrate_test.go b/aws/resource_aws_elasticache_replication_group_migrate_test.go index c014f7e6d68..c366e41ea0d 100644 --- a/aws/resource_aws_elasticache_replication_group_migrate_test.go +++ b/aws/resource_aws_elasticache_replication_group_migrate_test.go @@ -65,7 +65,7 @@ func TestAwsElasticacheReplicationGroupMigrateState_empty(t *testing.T) { // should handle non-nil but empty is = &terraform.InstanceState{} - is, err = resourceAwsElasticacheReplicationGroupMigrateState(0, is, meta) + _, err = resourceAwsElasticacheReplicationGroupMigrateState(0, is, meta) if err != nil { t.Fatalf("err: %#v", err) diff --git a/aws/resource_aws_elb.go b/aws/resource_aws_elb.go index 57cbe56d34d..9ddba075eeb 100644 --- a/aws/resource_aws_elb.go +++ b/aws/resource_aws_elb.go @@ -448,6 +448,9 @@ func flattenAwsELbResource(d *schema.ResourceData, ec2conn *ec2.EC2, elbconn *el resp, err := elbconn.DescribeTags(&elb.DescribeTagsInput{ LoadBalancerNames: []*string{lb.LoadBalancerName}, }) + if err != nil { + return fmt.Errorf("error describing tags for ELB (%s): %s", d.Id(), err) + } var et []*elb.Tag if len(resp.TagDescriptions) > 0 { diff --git a/aws/resource_aws_instance.go b/aws/resource_aws_instance.go index 65637d7a05c..4c876d9d50c 100644 --- a/aws/resource_aws_instance.go +++ b/aws/resource_aws_instance.go @@ -1064,6 +1064,9 @@ func resourceAwsInstanceUpdate(d *schema.ResourceData, meta interface{}) error { _, err := conn.StopInstances(&ec2.StopInstancesInput{ InstanceIds: []*string{aws.String(d.Id())}, }) + if err != nil { + return fmt.Errorf("error stopping instance (%s): %s", d.Id(), err) + } stateConf := &resource.StateChangeConf{ Pending: []string{"pending", "running", "shutting-down", "stopped", "stopping"}, @@ -1095,6 +1098,9 @@ func resourceAwsInstanceUpdate(d *schema.ResourceData, meta interface{}) error { _, err = conn.StartInstances(&ec2.StartInstancesInput{ InstanceIds: []*string{aws.String(d.Id())}, }) + if err != nil { + return fmt.Errorf("error starting instance (%s): %s", d.Id(), err) + } stateConf = &resource.StateChangeConf{ Pending: []string{"pending", "stopped"}, diff --git a/aws/resource_aws_instance_migrate_test.go b/aws/resource_aws_instance_migrate_test.go index bc591fd092a..35239faebeb 100644 --- a/aws/resource_aws_instance_migrate_test.go +++ b/aws/resource_aws_instance_migrate_test.go @@ -151,7 +151,7 @@ func TestAWSInstanceMigrateState_empty(t *testing.T) { // should handle non-nil but empty is = &terraform.InstanceState{} - is, err = resourceAwsInstanceMigrateState(0, is, meta) + _, err = resourceAwsInstanceMigrateState(0, is, meta) if err != nil { t.Fatalf("err: %#v", err) diff --git a/aws/resource_aws_kinesis_firehose_delivery_stream_migrate_test.go b/aws/resource_aws_kinesis_firehose_delivery_stream_migrate_test.go index 6f6f0c1d5c5..b22d1601a34 100644 --- a/aws/resource_aws_kinesis_firehose_delivery_stream_migrate_test.go +++ b/aws/resource_aws_kinesis_firehose_delivery_stream_migrate_test.go @@ -85,7 +85,7 @@ func TestAWSKinesisFirehoseMigrateState_empty(t *testing.T) { // should handle non-nil but empty is = &terraform.InstanceState{} - is, err = resourceAwsInstanceMigrateState(0, is, meta) + _, err = resourceAwsInstanceMigrateState(0, is, meta) if err != nil { t.Fatalf("err: %#v", err) diff --git a/aws/resource_aws_load_balancer_policy.go b/aws/resource_aws_load_balancer_policy.go index dfeea39f0ab..5d3bff0d6a2 100644 --- a/aws/resource_aws_load_balancer_policy.go +++ b/aws/resource_aws_load_balancer_policy.go @@ -163,6 +163,9 @@ func resourceAwsLoadBalancerPolicyUpdate(d *schema.ResourceData, meta interface{ } err = resourceAwsLoadBalancerPolicyCreate(d, meta) + if err != nil { + return err + } for _, listenerAssignment := range reassignments.listenerPolicies { if _, err := elbconn.SetLoadBalancerPoliciesOfListener(listenerAssignment); err != nil { diff --git a/aws/resource_aws_neptune_cluster_parameter_group.go b/aws/resource_aws_neptune_cluster_parameter_group.go index 7a879889d5c..3f31f345a13 100644 --- a/aws/resource_aws_neptune_cluster_parameter_group.go +++ b/aws/resource_aws_neptune_cluster_parameter_group.go @@ -206,7 +206,7 @@ func resourceAwsNeptuneClusterParameterGroupUpdate(d *schema.ResourceData, meta // We can only modify 20 parameters at a time, so walk them until // we've got them all. for parameters != nil { - paramsToModify := make([]*neptune.Parameter, 0) + var paramsToModify []*neptune.Parameter if len(parameters) <= neptuneClusterParameterGroupMaxParamsBulkEdit { paramsToModify, parameters = parameters[:], nil } else { diff --git a/aws/resource_aws_neptune_parameter_group.go b/aws/resource_aws_neptune_parameter_group.go index 4c20ee231c0..05bc64b556f 100644 --- a/aws/resource_aws_neptune_parameter_group.go +++ b/aws/resource_aws_neptune_parameter_group.go @@ -207,7 +207,7 @@ func resourceAwsNeptuneParameterGroupUpdate(d *schema.ResourceData, meta interfa log.Printf("[DEBUG] Parameters to add: %#v", toAdd) for len(toRemove) > 0 { - paramsToModify := make([]*neptune.Parameter, 0) + var paramsToModify []*neptune.Parameter if len(toRemove) <= maxParams { paramsToModify, toRemove = toRemove[:], nil } else { @@ -235,7 +235,7 @@ func resourceAwsNeptuneParameterGroupUpdate(d *schema.ResourceData, meta interfa } for len(toAdd) > 0 { - paramsToModify := make([]*neptune.Parameter, 0) + var paramsToModify []*neptune.Parameter if len(toAdd) <= maxParams { paramsToModify, toAdd = toAdd[:], nil } else { diff --git a/aws/resource_aws_rds_cluster.go b/aws/resource_aws_rds_cluster.go index 81f5f0db4f4..74288c62d4c 100644 --- a/aws/resource_aws_rds_cluster.go +++ b/aws/resource_aws_rds_cluster.go @@ -399,19 +399,15 @@ func resourceAwsRDSClusterCreate(d *schema.ResourceData, meta interface{}) error var identifier string if v, ok := d.GetOk("cluster_identifier"); ok { identifier = v.(string) + } else if v, ok := d.GetOk("cluster_identifier_prefix"); ok { + identifier = resource.PrefixedUniqueId(v.(string)) } else { - if v, ok := d.GetOk("cluster_identifier_prefix"); ok { - identifier = resource.PrefixedUniqueId(v.(string)) - } else { - identifier = resource.PrefixedUniqueId("tf-") - } - - d.Set("cluster_identifier", identifier) + identifier = resource.PrefixedUniqueId("tf-") } if _, ok := d.GetOk("snapshot_identifier"); ok { opts := rds.RestoreDBClusterFromSnapshotInput{ - DBClusterIdentifier: aws.String(d.Get("cluster_identifier").(string)), + DBClusterIdentifier: aws.String(identifier), Engine: aws.String(d.Get("engine").(string)), EngineMode: aws.String(d.Get("engine_mode").(string)), ScalingConfiguration: expandRdsScalingConfiguration(d.Get("scaling_configuration").([]interface{})), @@ -487,7 +483,7 @@ func resourceAwsRDSClusterCreate(d *schema.ResourceData, meta interface{}) error log.Printf("[INFO] RDS Cluster is restoring from snapshot with default db_cluster_parameter_group_name, backup_retention_period and vpc_security_group_ids" + "but custom values should be set, will now update after snapshot is restored!") - d.SetId(d.Get("cluster_identifier").(string)) + d.SetId(identifier) log.Printf("[INFO] RDS Cluster ID: %s", d.Id()) @@ -515,7 +511,7 @@ func resourceAwsRDSClusterCreate(d *schema.ResourceData, meta interface{}) error } } else if _, ok := d.GetOk("replication_source_identifier"); ok { createOpts := &rds.CreateDBClusterInput{ - DBClusterIdentifier: aws.String(d.Get("cluster_identifier").(string)), + DBClusterIdentifier: aws.String(identifier), Engine: aws.String(d.Get("engine").(string)), EngineMode: aws.String(d.Get("engine_mode").(string)), ReplicationSourceIdentifier: aws.String(d.Get("replication_source_identifier").(string)), @@ -609,7 +605,7 @@ func resourceAwsRDSClusterCreate(d *schema.ResourceData, meta interface{}) error } s3_bucket := v.([]interface{})[0].(map[string]interface{}) createOpts := &rds.RestoreDBClusterFromS3Input{ - DBClusterIdentifier: aws.String(d.Get("cluster_identifier").(string)), + DBClusterIdentifier: aws.String(identifier), Engine: aws.String(d.Get("engine").(string)), MasterUsername: aws.String(d.Get("master_username").(string)), MasterUserPassword: aws.String(d.Get("master_password").(string)), @@ -720,7 +716,7 @@ func resourceAwsRDSClusterCreate(d *schema.ResourceData, meta interface{}) error } createOpts := &rds.CreateDBClusterInput{ - DBClusterIdentifier: aws.String(d.Get("cluster_identifier").(string)), + DBClusterIdentifier: aws.String(identifier), Engine: aws.String(d.Get("engine").(string)), EngineMode: aws.String(d.Get("engine_mode").(string)), MasterUserPassword: aws.String(d.Get("master_password").(string)), @@ -815,7 +811,7 @@ func resourceAwsRDSClusterCreate(d *schema.ResourceData, meta interface{}) error log.Printf("[DEBUG]: RDS Cluster create response: %s", resp) } - d.SetId(d.Get("cluster_identifier").(string)) + d.SetId(identifier) log.Printf("[INFO] RDS Cluster ID: %s", d.Id()) diff --git a/aws/resource_aws_rds_cluster_parameter_group.go b/aws/resource_aws_rds_cluster_parameter_group.go index 577a5b6f4b3..1e0d9a971e7 100644 --- a/aws/resource_aws_rds_cluster_parameter_group.go +++ b/aws/resource_aws_rds_cluster_parameter_group.go @@ -214,7 +214,7 @@ func resourceAwsRDSClusterParameterGroupUpdate(d *schema.ResourceData, meta inte // We can only modify 20 parameters at a time, so walk them until // we've got them all. for parameters != nil { - paramsToModify := make([]*rds.Parameter, 0) + var paramsToModify []*rds.Parameter if len(parameters) <= rdsClusterParameterGroupMaxParamsBulkEdit { paramsToModify, parameters = parameters[:], nil } else { diff --git a/aws/resource_aws_s3_bucket_inventory.go b/aws/resource_aws_s3_bucket_inventory.go index 71b8f7eb0d8..e9b56cbec3b 100644 --- a/aws/resource_aws_s3_bucket_inventory.go +++ b/aws/resource_aws_s3_bucket_inventory.go @@ -303,6 +303,9 @@ func resourceAwsS3BucketInventoryRead(d *schema.ResourceData, meta interface{}) } return nil }) + if err != nil { + return fmt.Errorf("error getting S3 Bucket Inventory (%s): %s", d.Id(), err) + } if output == nil || output.InventoryConfiguration == nil { log.Printf("[WARN] %s S3 bucket inventory configuration not found, removing from state.", d.Id()) diff --git a/aws/resource_aws_security_group.go b/aws/resource_aws_security_group.go index 3b5da9805e7..b5e680d46b1 100644 --- a/aws/resource_aws_security_group.go +++ b/aws/resource_aws_security_group.go @@ -1381,14 +1381,12 @@ func protocolForValue(v string) string { // Similar to protocolIntegers() used by Network ACLs, but explicitly only // supports "tcp", "udp", "icmp", and "all" func sgProtocolIntegers() map[string]int { - var protocolIntegers = make(map[string]int) - protocolIntegers = map[string]int{ + return map[string]int{ "udp": 17, "tcp": 6, "icmp": 1, "all": -1, } - return protocolIntegers } // The AWS Lambda service creates ENIs behind the scenes and keeps these around for a while diff --git a/aws/resource_aws_security_group_migrate_test.go b/aws/resource_aws_security_group_migrate_test.go index e990ef3e1f1..54d6c4b078d 100644 --- a/aws/resource_aws_security_group_migrate_test.go +++ b/aws/resource_aws_security_group_migrate_test.go @@ -63,7 +63,7 @@ func TestAWSSecurityGroupMigrateState_empty(t *testing.T) { // should handle non-nil but empty is = &terraform.InstanceState{} - is, err = resourceAwsSecurityGroupMigrateState(0, is, meta) + _, err = resourceAwsSecurityGroupMigrateState(0, is, meta) if err != nil { t.Fatalf("err: %#v", err) diff --git a/aws/resource_aws_ssm_document.go b/aws/resource_aws_ssm_document.go index 685e8964a02..a8fcab91637 100644 --- a/aws/resource_aws_ssm_document.go +++ b/aws/resource_aws_ssm_document.go @@ -454,13 +454,11 @@ func getDocumentPermissions(d *schema.ResourceData, meta interface{}) (map[strin account_ids[i] = *resp.AccountIds[i] } - var ids = "" + ids := "" if len(account_ids) == 1 { ids = account_ids[0] } else if len(account_ids) > 1 { ids = strings.Join(account_ids, ",") - } else { - ids = "" } if ids == "" { diff --git a/aws/resource_aws_volume_attachment_test.go b/aws/resource_aws_volume_attachment_test.go index 0249ade8534..323db79d32c 100644 --- a/aws/resource_aws_volume_attachment_test.go +++ b/aws/resource_aws_volume_attachment_test.go @@ -72,8 +72,11 @@ func TestAccAWSVolumeAttachment_attachStopped(t *testing.T) { conn := testAccProvider.Meta().(*AWSClient).ec2conn _, err := conn.StopInstances(&ec2.StopInstancesInput{ - InstanceIds: []*string{aws.String(*i.InstanceId)}, + InstanceIds: []*string{i.InstanceId}, }) + if err != nil { + t.Fatalf("error stopping instance (%s): %s", aws.StringValue(i.InstanceId), err) + } stateConf := &resource.StateChangeConf{ Pending: []string{"pending", "running", "stopping"}, diff --git a/aws/resource_aws_waf_regex_match_set_test.go b/aws/resource_aws_waf_regex_match_set_test.go index e1ea24c3f1f..70003d0d61d 100644 --- a/aws/resource_aws_waf_regex_match_set_test.go +++ b/aws/resource_aws_waf_regex_match_set_test.go @@ -66,11 +66,14 @@ func testSweepWafRegexMatchSet(region string) error { _, err = wr.RetryWithToken(func(token *string) (interface{}, error) { req := &waf.DeleteRegexMatchSetInput{ ChangeToken: token, - RegexMatchSetId: aws.String(*set.RegexMatchSetId), + RegexMatchSetId: set.RegexMatchSetId, } log.Printf("[INFO] Deleting WAF Regex Match Set: %s", req) return conn.DeleteRegexMatchSet(req) }) + if err != nil { + return fmt.Errorf("error deleting WAF Regex Match Set (%s): %s", aws.StringValue(set.RegexMatchSetId), err) + } } return nil diff --git a/aws/resource_aws_waf_rule_group.go b/aws/resource_aws_waf_rule_group.go index 16c6e74f709..a6dd0aa921b 100644 --- a/aws/resource_aws_waf_rule_group.go +++ b/aws/resource_aws_waf_rule_group.go @@ -108,6 +108,9 @@ func resourceAwsWafRuleGroupRead(d *schema.ResourceData, meta interface{}) error rResp, err := conn.ListActivatedRulesInRuleGroup(&waf.ListActivatedRulesInRuleGroupInput{ RuleGroupId: aws.String(d.Id()), }) + if err != nil { + return fmt.Errorf("error listing activated rules in WAF Rule Group (%s): %s", d.Id(), err) + } d.Set("activated_rule", flattenWafActivatedRules(rResp.ActivatedRules)) d.Set("name", resp.RuleGroup.Name) diff --git a/aws/resource_aws_waf_rule_group_test.go b/aws/resource_aws_waf_rule_group_test.go index 6277a88973d..924adf8abe1 100644 --- a/aws/resource_aws_waf_rule_group_test.go +++ b/aws/resource_aws_waf_rule_group_test.go @@ -263,6 +263,9 @@ func testAccCheckAWSWafRuleGroupDisappears(group *waf.RuleGroup) resource.TestCh rResp, err := conn.ListActivatedRulesInRuleGroup(&waf.ListActivatedRulesInRuleGroupInput{ RuleGroupId: group.RuleGroupId, }) + if err != nil { + return fmt.Errorf("error listing activated rules in WAF Rule Group (%s): %s", aws.StringValue(group.RuleGroupId), err) + } wr := newWafRetryer(conn, "global") _, err = wr.RetryWithToken(func(token *string) (interface{}, error) { diff --git a/aws/resource_aws_wafregional_regex_match_set_test.go b/aws/resource_aws_wafregional_regex_match_set_test.go index 680bc16a584..d1fd6b5db62 100644 --- a/aws/resource_aws_wafregional_regex_match_set_test.go +++ b/aws/resource_aws_wafregional_regex_match_set_test.go @@ -67,11 +67,14 @@ func testSweepWafRegionalRegexMatchSet(region string) error { _, err = wr.RetryWithToken(func(token *string) (interface{}, error) { req := &waf.DeleteRegexMatchSetInput{ ChangeToken: token, - RegexMatchSetId: aws.String(*set.RegexMatchSetId), + RegexMatchSetId: set.RegexMatchSetId, } log.Printf("[INFO] Deleting WAF Regional Regex Match Set: %s", req) return conn.DeleteRegexMatchSet(req) }) + if err != nil { + return fmt.Errorf("error deleting WAF Regional Regex Match Set (%s): %s", aws.StringValue(set.RegexMatchSetId), err) + } } return nil diff --git a/aws/resource_aws_wafregional_rule_group.go b/aws/resource_aws_wafregional_rule_group.go index c170f3ac9dc..3af7db109f4 100644 --- a/aws/resource_aws_wafregional_rule_group.go +++ b/aws/resource_aws_wafregional_rule_group.go @@ -110,6 +110,9 @@ func resourceAwsWafRegionalRuleGroupRead(d *schema.ResourceData, meta interface{ rResp, err := conn.ListActivatedRulesInRuleGroup(&waf.ListActivatedRulesInRuleGroupInput{ RuleGroupId: aws.String(d.Id()), }) + if err != nil { + return fmt.Errorf("error listing activated rules in WAF Regional Rule Group (%s): %s", d.Id(), err) + } d.Set("activated_rule", flattenWafActivatedRules(rResp.ActivatedRules)) d.Set("name", resp.RuleGroup.Name) diff --git a/aws/resource_aws_wafregional_rule_group_test.go b/aws/resource_aws_wafregional_rule_group_test.go index cd679f91ee2..c58ea20f5ee 100644 --- a/aws/resource_aws_wafregional_rule_group_test.go +++ b/aws/resource_aws_wafregional_rule_group_test.go @@ -240,6 +240,9 @@ func testAccCheckAWSWafRegionalRuleGroupDisappears(group *waf.RuleGroup) resourc rResp, err := conn.ListActivatedRulesInRuleGroup(&waf.ListActivatedRulesInRuleGroupInput{ RuleGroupId: group.RuleGroupId, }) + if err != nil { + return fmt.Errorf("error listing activated rules in WAF Regional Rule Group (%s): %s", aws.StringValue(group.RuleGroupId), err) + } wr := newWafRegionalRetryer(conn, region) _, err = wr.RetryWithToken(func(token *string) (interface{}, error) { From 5c05a845e30e0d17ed19c2528f7289a6e3a22cb1 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Mon, 10 Sep 2018 13:00:33 -0400 Subject: [PATCH 097/184] tests/resource/aws_instance: Add sweeper ``` $ make sweep SWEEPARGS='-sweep-run=aws_instance' WARNING: This will destroy infrastructure. Use only in development accounts. go test ./... -v -sweep=us-east-1,us-west-2 -sweep-run=aws_instance ? github.com/terraform-providers/terraform-provider-aws [no test files] 2018/09/10 12:55:39 [DEBUG] Running Sweepers for region (us-east-1): 2018/09/10 12:55:39 [INFO] Building AWS region structure 2018/09/10 12:55:39 [INFO] Building AWS auth structure 2018/09/10 12:55:39 [INFO] Setting AWS metadata API timeout to 100ms 2018/09/10 12:55:40 [INFO] Ignoring AWS metadata API endpoint at default location as it doesn't return any instance-id 2018/09/10 12:55:40 [INFO] AWS Auth provider used: "EnvProvider" 2018/09/10 12:55:40 [INFO] Initializing DeviceFarm SDK connection 2018/09/10 12:55:40 [DEBUG] Trying to get account information via sts:GetCallerIdentity 2018/09/10 12:55:41 [INFO] Skipping EC2 Instance: i-02021584d9b372d65 2018/09/10 12:55:41 Sweeper Tests ran: - aws_instance 2018/09/10 12:55:41 [DEBUG] Running Sweepers for region (us-west-2): 2018/09/10 12:55:41 [INFO] Building AWS region structure 2018/09/10 12:55:41 [INFO] Building AWS auth structure 2018/09/10 12:55:41 [INFO] Setting AWS metadata API timeout to 100ms 2018/09/10 12:55:41 [INFO] Ignoring AWS metadata API endpoint at default location as it doesn't return any instance-id 2018/09/10 12:55:41 [INFO] AWS Auth provider used: "EnvProvider" 2018/09/10 12:55:41 [INFO] Initializing DeviceFarm SDK connection 2018/09/10 12:55:41 [DEBUG] Trying to get account information via sts:GetCallerIdentity 2018/09/10 12:55:43 [INFO] Terminating EC2 Instance: i-0e1108b3f5fe4f5f9 2018/09/10 12:55:43 [INFO] Terminating instance: i-0e1108b3f5fe4f5f9 2018/09/10 12:55:44 [DEBUG] Waiting for instance (i-0e1108b3f5fe4f5f9) to become terminated 2018/09/10 12:55:44 [DEBUG] Waiting for state to become: [terminated] 2018/09/10 12:55:54 [TRACE] Waiting 3s before next try 2018/09/10 12:55:58 [TRACE] Waiting 6s before next try 2018/09/10 12:56:04 [TRACE] Waiting 10s before next try 2018/09/10 12:56:15 [TRACE] Waiting 10s before next try 2018/09/10 12:56:25 [TRACE] Waiting 10s before next try 2018/09/10 12:56:36 [INFO] Terminating EC2 Instance: i-03b969954c3865b1a 2018/09/10 12:56:36 [INFO] Terminating instance: i-03b969954c3865b1a 2018/09/10 12:56:36 [DEBUG] Waiting for instance (i-03b969954c3865b1a) to become terminated 2018/09/10 12:56:36 [DEBUG] Waiting for state to become: [terminated] 2018/09/10 12:56:47 [INFO] Skipping EC2 Instance: i-0170bc5bbcc73ea04 2018/09/10 12:56:47 [INFO] Terminating EC2 Instance: i-0fc2d51082859b075 2018/09/10 12:56:47 [INFO] Terminating instance: i-0fc2d51082859b075 2018/09/10 12:56:47 [DEBUG] Waiting for instance (i-0fc2d51082859b075) to become terminated 2018/09/10 12:56:47 [DEBUG] Waiting for state to become: [terminated] 2018/09/10 12:56:57 [INFO] Skipping EC2 Instance: i-0eaa10dec1c06e18c 2018/09/10 12:56:57 [INFO] Skipping EC2 Instance: i-02034867a7389cbaf 2018/09/10 12:56:57 Sweeper Tests ran: - aws_instance ok github.com/terraform-providers/terraform-provider-aws/aws 79.107s ``` --- aws/resource_aws_instance.go | 6 +-- aws/resource_aws_instance_test.go | 60 +++++++++++++++++++++++ aws/resource_aws_spot_instance_request.go | 2 +- aws/resource_aws_subnet_test.go | 3 +- 4 files changed, 66 insertions(+), 5 deletions(-) diff --git a/aws/resource_aws_instance.go b/aws/resource_aws_instance.go index 65637d7a05c..221fea6fd4d 100644 --- a/aws/resource_aws_instance.go +++ b/aws/resource_aws_instance.go @@ -1185,7 +1185,7 @@ func resourceAwsInstanceUpdate(d *schema.ResourceData, meta interface{}) error { func resourceAwsInstanceDelete(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).ec2conn - if err := awsTerminateInstance(conn, d.Id(), d); err != nil { + if err := awsTerminateInstance(conn, d.Id(), d.Timeout(schema.TimeoutDelete)); err != nil { return err } @@ -1880,7 +1880,7 @@ func buildAwsInstanceOpts( return opts, nil } -func awsTerminateInstance(conn *ec2.EC2, id string, d *schema.ResourceData) error { +func awsTerminateInstance(conn *ec2.EC2, id string, timeout time.Duration) error { log.Printf("[INFO] Terminating instance: %s", id) req := &ec2.TerminateInstancesInput{ InstanceIds: []*string{aws.String(id)}, @@ -1895,7 +1895,7 @@ func awsTerminateInstance(conn *ec2.EC2, id string, d *schema.ResourceData) erro Pending: []string{"pending", "running", "shutting-down", "stopped", "stopping"}, Target: []string{"terminated"}, Refresh: InstanceStateRefreshFunc(conn, id, []string{}), - Timeout: d.Timeout(schema.TimeoutDelete), + Timeout: timeout, Delay: 10 * time.Second, MinTimeout: 3 * time.Second, } diff --git a/aws/resource_aws_instance_test.go b/aws/resource_aws_instance_test.go index 4c1141630f6..86281704b92 100644 --- a/aws/resource_aws_instance_test.go +++ b/aws/resource_aws_instance_test.go @@ -2,9 +2,12 @@ package aws import ( "fmt" + "log" "reflect" "regexp" + "strings" "testing" + "time" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/awserr" @@ -17,6 +20,63 @@ import ( "github.com/hashicorp/terraform/terraform" ) +func init() { + resource.AddTestSweepers("aws_instance", &resource.Sweeper{ + Name: "aws_instance", + F: testSweepInstances, + }) +} + +func testSweepInstances(region string) error { + client, err := sharedClientForRegion(region) + if err != nil { + return fmt.Errorf("error getting client: %s", err) + } + conn := client.(*AWSClient).ec2conn + + err = conn.DescribeInstancesPages(&ec2.DescribeInstancesInput{}, func(page *ec2.DescribeInstancesOutput, isLast bool) bool { + if len(page.Reservations) == 0 { + log.Print("[DEBUG] No EC2 Instances to sweep") + return false + } + + for _, reservation := range page.Reservations { + for _, instance := range reservation.Instances { + var nameTag string + id := aws.StringValue(instance.InstanceId) + + for _, instanceTag := range instance.Tags { + if aws.StringValue(instanceTag.Key) == "Name" { + nameTag = aws.StringValue(instanceTag.Value) + break + } + } + + if !strings.HasPrefix(nameTag, "tf-acc-test-") { + log.Printf("[INFO] Skipping EC2 Instance: %s", id) + continue + } + + log.Printf("[INFO] Terminating EC2 Instance: %s", id) + err := awsTerminateInstance(conn, id, 5*time.Minute) + if err != nil { + log.Printf("[ERROR] Error terminating EC2 Instance (%s): %s", id, err) + } + } + } + return !isLast + }) + if err != nil { + if testSweepSkipSweepError(err) { + log.Printf("[WARN] Skipping EC2 Instance sweep for %s: %s", region, err) + return nil + } + return fmt.Errorf("Error retrieving EC2 Instances: %s", err) + } + + return nil +} + func TestFetchRootDevice(t *testing.T) { cases := []struct { label string diff --git a/aws/resource_aws_spot_instance_request.go b/aws/resource_aws_spot_instance_request.go index 5460b0790cc..ed9601dd208 100644 --- a/aws/resource_aws_spot_instance_request.go +++ b/aws/resource_aws_spot_instance_request.go @@ -396,7 +396,7 @@ func resourceAwsSpotInstanceRequestDelete(d *schema.ResourceData, meta interface if instanceId := d.Get("spot_instance_id").(string); instanceId != "" { log.Printf("[INFO] Terminating instance: %s", instanceId) - if err := awsTerminateInstance(conn, instanceId, d); err != nil { + if err := awsTerminateInstance(conn, instanceId, d.Timeout(schema.TimeoutDelete)); err != nil { return fmt.Errorf("Error terminating spot instance: %s", err) } } diff --git a/aws/resource_aws_subnet_test.go b/aws/resource_aws_subnet_test.go index 27044f9992a..29eca6680c7 100644 --- a/aws/resource_aws_subnet_test.go +++ b/aws/resource_aws_subnet_test.go @@ -3,6 +3,7 @@ package aws import ( "fmt" "log" + "regexp" "testing" "github.com/aws/aws-sdk-go/aws" @@ -10,7 +11,6 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" - "regexp" ) // add sweeper to delete known test subnets @@ -30,6 +30,7 @@ func init() { "aws_elasticache_replication_group", "aws_elasticsearch_domain", "aws_elb", + "aws_instance", "aws_lambda_function", "aws_lb", "aws_mq_broker", From 8cdf0882dde6179e7efc66d714e3d5290e674f65 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Mon, 10 Sep 2018 13:50:15 -0400 Subject: [PATCH 098/184] tests/resource/aws_lb: Ensure testacc prefix load balancers are included in sweeper ``` $ make sweep SWEEPARGS='-sweep-run=aws_lb' WARNING: This will destroy infrastructure. Use only in development accounts. go test ./... -v -sweep=us-east-1,us-west-2 -sweep-run=aws_lb ? github.com/terraform-providers/terraform-provider-aws [no test files] 2018/09/10 13:48:24 [DEBUG] Running Sweepers for region (us-east-1): 2018/09/10 13:48:24 [INFO] Building AWS region structure 2018/09/10 13:48:24 [INFO] Building AWS auth structure 2018/09/10 13:48:24 [INFO] Setting AWS metadata API timeout to 100ms 2018/09/10 13:48:25 [INFO] Ignoring AWS metadata API endpoint at default location as it doesn't return any instance-id 2018/09/10 13:48:25 [INFO] AWS Auth provider used: "EnvProvider" 2018/09/10 13:48:25 [INFO] Initializing DeviceFarm SDK connection 2018/09/10 13:48:25 [DEBUG] Trying to get account information via sts:GetCallerIdentity 2018/09/10 13:48:25 [DEBUG] No LBs to sweep 2018/09/10 13:48:25 [DEBUG] Sweeper (aws_lb_target_group) has dependency (aws_lb), running.. 2018/09/10 13:48:25 [DEBUG] Sweeper (aws_lb) already ran in region (us-east-1) 2018/09/10 13:48:25 [INFO] Building AWS region structure 2018/09/10 13:48:25 [INFO] Building AWS auth structure 2018/09/10 13:48:25 [INFO] Setting AWS metadata API timeout to 100ms 2018/09/10 13:48:26 [INFO] Ignoring AWS metadata API endpoint at default location as it doesn't return any instance-id 2018/09/10 13:48:26 [INFO] AWS Auth provider used: "EnvProvider" 2018/09/10 13:48:26 [INFO] Initializing DeviceFarm SDK connection 2018/09/10 13:48:26 [DEBUG] Trying to get account information via sts:GetCallerIdentity 2018/09/10 13:48:26 [DEBUG] No LB Target Groups to sweep 2018/09/10 13:48:26 Sweeper Tests ran: - aws_lb - aws_lb_target_group 2018/09/10 13:48:26 [DEBUG] Running Sweepers for region (us-west-2): 2018/09/10 13:48:26 [INFO] Building AWS region structure 2018/09/10 13:48:26 [INFO] Building AWS auth structure 2018/09/10 13:48:26 [INFO] Setting AWS metadata API timeout to 100ms 2018/09/10 13:48:27 [INFO] Ignoring AWS metadata API endpoint at default location as it doesn't return any instance-id 2018/09/10 13:48:27 [INFO] AWS Auth provider used: "EnvProvider" 2018/09/10 13:48:27 [INFO] Initializing DeviceFarm SDK connection 2018/09/10 13:48:27 [DEBUG] Trying to get account information via sts:GetCallerIdentity 2018/09/10 13:48:28 [INFO] Deleting LB: testaccawslbaccesslog-wghk 2018/09/10 13:48:29 [DEBUG] Sweeper (aws_lb_target_group) has dependency (aws_lb), running.. 2018/09/10 13:48:29 [DEBUG] Sweeper (aws_lb) already ran in region (us-west-2) 2018/09/10 13:48:29 [INFO] Building AWS region structure 2018/09/10 13:48:29 [INFO] Building AWS auth structure 2018/09/10 13:48:29 [INFO] Setting AWS metadata API timeout to 100ms 2018/09/10 13:48:29 [INFO] Ignoring AWS metadata API endpoint at default location as it doesn't return any instance-id 2018/09/10 13:48:29 [INFO] AWS Auth provider used: "EnvProvider" 2018/09/10 13:48:29 [INFO] Initializing DeviceFarm SDK connection 2018/09/10 13:48:29 [DEBUG] Trying to get account information via sts:GetCallerIdentity 2018/09/10 13:48:30 [DEBUG] No LB Target Groups to sweep 2018/09/10 13:48:30 Sweeper Tests ran: - aws_lb - aws_lb_target_group ok github.com/terraform-providers/terraform-provider-aws/aws 7.003s ``` --- aws/resource_aws_lb_test.go | 1 + 1 file changed, 1 insertion(+) diff --git a/aws/resource_aws_lb_test.go b/aws/resource_aws_lb_test.go index b93352d2e2e..74f45b508c2 100644 --- a/aws/resource_aws_lb_test.go +++ b/aws/resource_aws_lb_test.go @@ -34,6 +34,7 @@ func testSweepLBs(region string) error { "tf-test-", "tf-acc-test-", "test-", + "testacc", } err = conn.DescribeLoadBalancersPages(&elbv2.DescribeLoadBalancersInput{}, func(page *elbv2.DescribeLoadBalancersOutput, isLast bool) bool { From 0ec83431b44a51d1135f8710ca4d37903df596f7 Mon Sep 17 00:00:00 2001 From: Kash Date: Mon, 10 Sep 2018 15:15:37 -0400 Subject: [PATCH 099/184] allow ipv4_address_count and ipv6_address_count to be modifiable --- aws/resource_aws_launch_template.go | 36 +++++++++++------------- aws/resource_aws_launch_template_test.go | 4 +++ 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/aws/resource_aws_launch_template.go b/aws/resource_aws_launch_template.go index ca1fb2d662b..498b4545af6 100644 --- a/aws/resource_aws_launch_template.go +++ b/aws/resource_aws_launch_template.go @@ -319,7 +319,7 @@ func resourceAwsLaunchTemplate() *schema.Resource { }, "ipv6_address_count": { Type: schema.TypeInt, - Computed: true, + Optional: true, }, "ipv6_addresses": { Type: schema.TypeSet, @@ -341,7 +341,7 @@ func resourceAwsLaunchTemplate() *schema.Resource { }, "ipv4_address_count": { Type: schema.TypeInt, - Computed: true, + Optional: true, }, "subnet_id": { Type: schema.TypeString, @@ -1095,30 +1095,28 @@ func readNetworkInterfacesFromConfig(ni map[string]interface{}) *ec2.LaunchTempl } } - ipv6AddressList := ni["ipv6_addresses"].(*schema.Set).List() - for _, address := range ipv6AddressList { - ipv6Addresses = append(ipv6Addresses, &ec2.InstanceIpv6AddressRequest{ - Ipv6Address: aws.String(address.(string)), - }) - } - networkInterface.Ipv6Addresses = ipv6Addresses - if v := ni["ipv6_address_count"].(int); v > 0 { networkInterface.Ipv6AddressCount = aws.Int64(int64(v)) - } - - ipv4AddressList := ni["ipv4_addresses"].(*schema.Set).List() - for _, address := range ipv4AddressList { - privateIp := &ec2.PrivateIpAddressSpecification{ - Primary: aws.Bool(address.(string) == privateIpAddress), - PrivateIpAddress: aws.String(address.(string)), + } else if v := ni["ipv6_addresses"].(*schema.Set); v.Len() > 0 { + for _, address := range v.List() { + ipv6Addresses = append(ipv6Addresses, &ec2.InstanceIpv6AddressRequest{ + Ipv6Address: aws.String(address.(string)), + }) } - ipv4Addresses = append(ipv4Addresses, privateIp) + networkInterface.Ipv6Addresses = ipv6Addresses } - networkInterface.PrivateIpAddresses = ipv4Addresses if v := ni["ipv4_address_count"].(int); v > 0 { networkInterface.SecondaryPrivateIpAddressCount = aws.Int64(int64(v)) + } else if v := ni["ipv4_addresses"].(*schema.Set); v.Len() > 0 { + for _, address := range v.List() { + privateIp := &ec2.PrivateIpAddressSpecification{ + Primary: aws.Bool(address.(string) == privateIpAddress), + PrivateIpAddress: aws.String(address.(string)), + } + ipv4Addresses = append(ipv4Addresses, privateIp) + } + networkInterface.PrivateIpAddresses = ipv4Addresses } return networkInterface diff --git a/aws/resource_aws_launch_template_test.go b/aws/resource_aws_launch_template_test.go index c151c15e709..ec4939eaadf 100644 --- a/aws/resource_aws_launch_template_test.go +++ b/aws/resource_aws_launch_template_test.go @@ -243,6 +243,8 @@ func TestAccAWSLaunchTemplate_networkInterface(t *testing.T) { resource.TestCheckResourceAttr(resName, "network_interfaces.#", "1"), resource.TestCheckResourceAttrSet(resName, "network_interfaces.0.network_interface_id"), resource.TestCheckResourceAttr(resName, "network_interfaces.0.associate_public_ip_address", "false"), + resource.TestCheckResourceAttr(resName, "network_interfaces.0.ipv4_address_count", "2"), + resource.TestCheckResourceAttr(resName, "network_interfaces.0.ipv6_address_count", "3"), ), }, }, @@ -525,6 +527,8 @@ resource "aws_launch_template" "test" { network_interfaces { network_interface_id = "${aws_network_interface.test.id}" + ipv4_address_count = 2 + ipv6_address_count = 3 } } ` From cb0b45eb207319cbe9da21ff88e16922e88b4af4 Mon Sep 17 00:00:00 2001 From: Kash Date: Mon, 10 Sep 2018 15:37:51 -0400 Subject: [PATCH 100/184] update documentation --- website/docs/r/launch_template.html.markdown | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/website/docs/r/launch_template.html.markdown b/website/docs/r/launch_template.html.markdown index bf2d63f6da4..b3287cde57a 100644 --- a/website/docs/r/launch_template.html.markdown +++ b/website/docs/r/launch_template.html.markdown @@ -211,12 +211,12 @@ Each `network_interfaces` block supports the following: * `delete_on_termination` - Whether the network interface should be destroyed on instance termination. * `description` - Description of the network interface. * `device_index` - The integer index of the network interface attachment. -* `ipv6_addresses` - One or more specific IPv6 addresses from the IPv6 CIDR block range of your subnet. +* `ipv6_addresses` - One or more specific IPv6 addresses from the IPv6 CIDR block range of your subnet. Conflicts with `ipv6_address_count` * `ipv6_address_count` - The number of IPv6 addresses to assign to a network interface. Conflicts with `ipv6_addresses` * `network_interface_id` - The ID of the network interface to attach. * `private_ip_address` - The primary private IPv4 address. -* `ipv4_address_count` - The number of secondary private IPv4 addresses to assign to a network interface. -* `ipv4_addresses` - One or more private IPv4 addresses to associate. +* `ipv4_address_count` - The number of secondary private IPv4 addresses to assign to a network interface. Conflicts with `ipv4_address_count` +* `ipv4_addresses` - One or more private IPv4 addresses to associate. Conflicts with `ipv4_addresses` * `security_groups` - A list of security group IDs to associate. * `subnet_id` - The VPC Subnet ID to associate. From 620c6c1b50813f4f49dc257546767c1cbfa3bb9e Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Mon, 10 Sep 2018 15:42:24 -0400 Subject: [PATCH 101/184] tests/resource/aws_vpn_gateway: Ensure sweeper handles VPC detachment prior to deletion Previously: ``` [06:15:31][Step 2/4] 2018/09/10 06:15:31 [ERR] error running (aws_vpn_gateway): Error deleting VPN Gateway (vgw-0ab6d375ee407dddc): IncorrectState: The VPN gateway is in use. [06:15:31][Step 2/4] status code: 400, request id: 1a6b988e-4297-4f80-a664-6dd103bd9dd4 [06:15:31][Step 2/4] FAIL github.com/terraform-providers/terraform-provider-aws/aws 128.515s [06:15:31][Step 2/4] Process exited with code 1 [06:15:31][Step 2/4] Process exited with code 1 (Step: Pre-Sweeper (Command Line)) [06:15:31][Step 2/4] Step Pre-Sweeper (Command Line) failed ``` Now: ``` 2018/09/10 15:38:40 Sweeper Tests ran: - aws_spot_fleet_request - aws_subnet - aws_security_group - aws_batch_compute_environment - aws_lambda_function - aws_network_acl - aws_elasticache_cluster - aws_redshift_cluster - aws_beanstalk_environment - aws_eks_cluster - aws_elasticsearch_domain - aws_lb - aws_mq_broker - aws_nat_gateway - aws_autoscaling_group - aws_batch_job_queue - aws_vpn_gateway - aws_vpc - aws_elb - aws_internet_gateway - aws_db_instance - aws_elasticache_replication_group ok github.com/terraform-providers/terraform-provider-aws/aws 34.101s ``` --- aws/resource_aws_vpn_gateway_test.go | 36 ++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 5 deletions(-) diff --git a/aws/resource_aws_vpn_gateway_test.go b/aws/resource_aws_vpn_gateway_test.go index 3b752de4373..239068ee400 100644 --- a/aws/resource_aws_vpn_gateway_test.go +++ b/aws/resource_aws_vpn_gateway_test.go @@ -53,13 +53,39 @@ func testSweepVPNGateways(region string) error { } for _, vpng := range resp.VpnGateways { - _, err := conn.DeleteVpnGateway(&ec2.DeleteVpnGatewayInput{ + for _, vpcAttachment := range vpng.VpcAttachments { + input := &ec2.DetachVpnGatewayInput{ + VpcId: vpcAttachment.VpcId, + VpnGatewayId: vpng.VpnGatewayId, + } + + log.Printf("[DEBUG] Detaching VPN Gateway: %s", input) + _, err := conn.DetachVpnGateway(input) + if err != nil { + return fmt.Errorf("error detaching VPN Gateway (%s) from VPC (%s): %s", aws.StringValue(vpng.VpnGatewayId), aws.StringValue(vpcAttachment.VpcId), err) + } + + stateConf := &resource.StateChangeConf{ + Pending: []string{"attached", "detaching"}, + Target: []string{"detached"}, + Refresh: vpnGatewayAttachmentStateRefresh(conn, aws.StringValue(vpcAttachment.VpcId), aws.StringValue(vpng.VpnGatewayId)), + Timeout: 10 * time.Minute, + } + + log.Printf("[DEBUG] Waiting for VPN Gateway (%s) to detach from VPC (%s)", aws.StringValue(vpng.VpnGatewayId), aws.StringValue(vpcAttachment.VpcId)) + if _, err = stateConf.WaitForState(); err != nil { + return fmt.Errorf("error waiting for VPN Gateway (%s) to detach from VPC (%s): %s", aws.StringValue(vpng.VpnGatewayId), aws.StringValue(vpcAttachment.VpcId), err) + } + } + + input := &ec2.DeleteVpnGatewayInput{ VpnGatewayId: vpng.VpnGatewayId, - }) + } + + log.Printf("[DEBUG] Deleting VPN Gateway: %s", input) + _, err := conn.DeleteVpnGateway(input) if err != nil { - return fmt.Errorf( - "Error deleting VPN Gateway (%s): %s", - *vpng.VpnGatewayId, err) + return fmt.Errorf("error deleting VPN Gateway (%s): %s", aws.StringValue(vpng.VpnGatewayId), err) } } From 57379dddbbd49a08d5b3f40420b6f4d42b9878cb Mon Sep 17 00:00:00 2001 From: Joshua Carp Date: Tue, 11 Sep 2018 00:39:06 -0400 Subject: [PATCH 102/184] Suppress task definition diffs for equivalent port mappings. When using the `awsvpc` networking mode, aws assigns the value of `containerPort` to the `hostPort` for each item in `portMappings`. This leads to spurious diffs if the user doesn't set `hostPort`. This patch suppresses diffs when using `awsvpc` networking and the `hostPort` field is unset. [Fixes #3401] --- aws/ecs_task_definition_equivalency.go | 11 ++-- aws/ecs_task_definition_equivalency_test.go | 58 ++++++++++++++++++-- aws/resource_aws_ecs_task_definition.go | 4 +- aws/resource_aws_ecs_task_definition_test.go | 14 +++-- 4 files changed, 74 insertions(+), 13 deletions(-) diff --git a/aws/ecs_task_definition_equivalency.go b/aws/ecs_task_definition_equivalency.go index 52c5e38fe7e..8dd5394a2d3 100644 --- a/aws/ecs_task_definition_equivalency.go +++ b/aws/ecs_task_definition_equivalency.go @@ -13,13 +13,13 @@ import ( "github.com/mitchellh/copystructure" ) -func ecsContainerDefinitionsAreEquivalent(def1, def2 string) (bool, error) { +func ecsContainerDefinitionsAreEquivalent(def1, def2 string, isAWSVPC bool) (bool, error) { var obj1 containerDefinitions err := json.Unmarshal([]byte(def1), &obj1) if err != nil { return false, err } - err = obj1.Reduce() + err = obj1.Reduce(isAWSVPC) if err != nil { return false, err } @@ -33,7 +33,7 @@ func ecsContainerDefinitionsAreEquivalent(def1, def2 string) (bool, error) { if err != nil { return false, err } - err = obj2.Reduce() + err = obj2.Reduce(isAWSVPC) if err != nil { return false, err } @@ -53,7 +53,7 @@ func ecsContainerDefinitionsAreEquivalent(def1, def2 string) (bool, error) { type containerDefinitions []*ecs.ContainerDefinition -func (cd containerDefinitions) Reduce() error { +func (cd containerDefinitions) Reduce(isAWSVPC bool) error { for i, def := range cd { // Deal with special fields which have defaults if def.Cpu != nil && *def.Cpu == 0 { @@ -69,6 +69,9 @@ func (cd containerDefinitions) Reduce() error { if pm.HostPort != nil && *pm.HostPort == 0 { cd[i].PortMappings[j].HostPort = nil } + if isAWSVPC && cd[i].PortMappings[j].HostPort == nil { + cd[i].PortMappings[j].HostPort = cd[i].PortMappings[j].ContainerPort + } } // Deal with fields which may be re-ordered in the API diff --git a/aws/ecs_task_definition_equivalency_test.go b/aws/ecs_task_definition_equivalency_test.go index a05517bca03..d128e647c1f 100644 --- a/aws/ecs_task_definition_equivalency_test.go +++ b/aws/ecs_task_definition_equivalency_test.go @@ -78,7 +78,7 @@ func TestAwsEcsContainerDefinitionsAreEquivalent_basic(t *testing.T) { } ]` - equal, err := ecsContainerDefinitionsAreEquivalent(cfgRepresention, apiRepresentation) + equal, err := ecsContainerDefinitionsAreEquivalent(cfgRepresention, apiRepresentation, false) if err != nil { t.Fatal(err) } @@ -125,7 +125,57 @@ func TestAwsEcsContainerDefinitionsAreEquivalent_portMappings(t *testing.T) { } ]` - equal, err := ecsContainerDefinitionsAreEquivalent(cfgRepresention, apiRepresentation) + equal, err := ecsContainerDefinitionsAreEquivalent(cfgRepresention, apiRepresentation, false) + if err != nil { + t.Fatal(err) + } + if !equal { + t.Fatal("Expected definitions to be equal.") + } +} + +func TestAwsEcsContainerDefinitionsAreEquivalent_portMappingsIgnoreHostPort(t *testing.T) { + cfgRepresention := ` +[ + { + "name": "wordpress", + "image": "wordpress", + "portMappings": [ + { + "containerPort": 80, + "hostPort": 80 + } + ] + } +]` + + apiRepresentation := ` +[ + { + "name": "wordpress", + "image": "wordpress", + "portMappings": [ + { + "containerPort": 80 + } + ] + } +]` + + var ( + equal bool + err error + ) + + equal, err = ecsContainerDefinitionsAreEquivalent(cfgRepresention, apiRepresentation, false) + if err != nil { + t.Fatal(err) + } + if equal { + t.Fatal("Expected definitions to differ.") + } + + equal, err = ecsContainerDefinitionsAreEquivalent(cfgRepresention, apiRepresentation, true) if err != nil { t.Fatal(err) } @@ -378,7 +428,7 @@ func TestAwsEcsContainerDefinitionsAreEquivalent_arrays(t *testing.T) { ] ` - equal, err := ecsContainerDefinitionsAreEquivalent(cfgRepresention, apiRepresentation) + equal, err := ecsContainerDefinitionsAreEquivalent(cfgRepresention, apiRepresentation, false) if err != nil { t.Fatal(err) } @@ -416,7 +466,7 @@ func TestAwsEcsContainerDefinitionsAreEquivalent_negative(t *testing.T) { } ]` - equal, err := ecsContainerDefinitionsAreEquivalent(cfgRepresention, apiRepresentation) + equal, err := ecsContainerDefinitionsAreEquivalent(cfgRepresention, apiRepresentation, false) if err != nil { t.Fatal(err) } diff --git a/aws/resource_aws_ecs_task_definition.go b/aws/resource_aws_ecs_task_definition.go index fbf3a329c1e..db91e1db65d 100644 --- a/aws/resource_aws_ecs_task_definition.go +++ b/aws/resource_aws_ecs_task_definition.go @@ -54,7 +54,9 @@ func resourceAwsEcsTaskDefinition() *schema.Resource { return json }, DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool { - equal, _ := ecsContainerDefinitionsAreEquivalent(old, new) + networkMode, ok := d.GetOk("network_mode") + isAWSVPC := ok && networkMode.(string) == ecs.NetworkModeAwsvpc + equal, _ := ecsContainerDefinitionsAreEquivalent(old, new, isAWSVPC) return equal }, ValidateFunc: validateAwsEcsTaskDefinitionContainerDefinitions, diff --git a/aws/resource_aws_ecs_task_definition_test.go b/aws/resource_aws_ecs_task_definition_test.go index 4dc286abad1..0c820faf40b 100644 --- a/aws/resource_aws_ecs_task_definition_test.go +++ b/aws/resource_aws_ecs_task_definition_test.go @@ -227,7 +227,7 @@ func TestAccAWSEcsTaskDefinition_Fargate(t *testing.T) { CheckDestroy: testAccCheckAWSEcsTaskDefinitionDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSEcsTaskDefinitionFargate(tdName), + Config: testAccAWSEcsTaskDefinitionFargate(tdName, `[{"protocol": "tcp", "containerPort": 8000}]`), Check: resource.ComposeTestCheckFunc( testAccCheckAWSEcsTaskDefinitionExists("aws_ecs_task_definition.fargate", &conf), resource.TestCheckResourceAttr("aws_ecs_task_definition.fargate", "requires_compatibilities.#", "1"), @@ -235,6 +235,11 @@ func TestAccAWSEcsTaskDefinition_Fargate(t *testing.T) { resource.TestCheckResourceAttr("aws_ecs_task_definition.fargate", "memory", "512"), ), }, + { + ExpectNonEmptyPlan: false, + PlanOnly: true, + Config: testAccAWSEcsTaskDefinitionFargate(tdName, `[{"protocol": "tcp", "containerPort": 8000, "hostPort": 8000}]`), + }, }, }) } @@ -649,7 +654,7 @@ TASK_DEFINITION `, tdName) } -func testAccAWSEcsTaskDefinitionFargate(tdName string) string { +func testAccAWSEcsTaskDefinitionFargate(tdName, portMappings string) string { return fmt.Sprintf(` resource "aws_ecs_task_definition" "fargate" { family = "%s" @@ -665,12 +670,13 @@ resource "aws_ecs_task_definition" "fargate" { "cpu": 10, "command": ["sleep","360"], "memory": 10, - "essential": true + "essential": true, + "portMappings": %s } ] TASK_DEFINITION } -`, tdName) +`, tdName, portMappings) } func testAccAWSEcsTaskDefinitionExecutionRole(roleName, policyName, tdName string) string { From d62d96195786e7be4b7a5b908a49b75eac1e6fe9 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 11 Sep 2018 08:02:31 -0400 Subject: [PATCH 103/184] docs/resource/aws_api_gateway_deployment: Additional information about stage_name argument Reference: https://docs.aws.amazon.com/apigateway/api-reference/link-relation/deployment-create/ --- website/docs/r/api_gateway_deployment.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/api_gateway_deployment.html.markdown b/website/docs/r/api_gateway_deployment.html.markdown index d901f6730e0..528e5eba2ae 100644 --- a/website/docs/r/api_gateway_deployment.html.markdown +++ b/website/docs/r/api_gateway_deployment.html.markdown @@ -58,7 +58,7 @@ resource "aws_api_gateway_deployment" "MyDemoDeployment" { The following arguments are supported: * `rest_api_id` - (Required) The ID of the associated REST API -* `stage_name` - (Required) The name of the stage +* `stage_name` - (Required) The name of the stage. If the specified stage already exists, it will be updated to point to the new deployment. If the stage does not exist, a new one will be created and point to this deployment. Use `""` to point at the default stage. * `description` - (Optional) The description of the deployment * `stage_description` - (Optional) The description of the stage * `variables` - (Optional) A map that defines variables for the stage From 71d43a2a1f7c85a9e93f157e4f42668a759e6f73 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 11 Sep 2018 10:19:54 -0400 Subject: [PATCH 104/184] tests/resource/aws_vpc: Allow sweeper to handle EC2 eventual consistency ``` $ make sweep SWEEP=us-west-2 SWEEPARGS='-sweep-run=aws_vpc' ... 2018/09/11 10:18:47 Sweeper Tests ran: - aws_internet_gateway - aws_nat_gateway - aws_autoscaling_group - aws_elb - aws_instance - aws_redshift_cluster - aws_network_acl - aws_elasticache_replication_group - aws_elasticsearch_domain - aws_mq_broker - aws_spot_fleet_request - aws_vpc - aws_security_group - aws_batch_job_queue - aws_batch_compute_environment - aws_eks_cluster - aws_subnet - aws_vpn_gateway - aws_beanstalk_environment - aws_db_instance - aws_elasticache_cluster - aws_lambda_function - aws_lb ok github.com/terraform-providers/terraform-provider-aws/aws 56.201s ``` --- aws/resource_aws_vpc_test.go | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/aws/resource_aws_vpc_test.go b/aws/resource_aws_vpc_test.go index c010015c723..91162a33bab 100644 --- a/aws/resource_aws_vpc_test.go +++ b/aws/resource_aws_vpc_test.go @@ -4,6 +4,7 @@ import ( "fmt" "log" "testing" + "time" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/awserr" @@ -60,14 +61,25 @@ func testSweepVPCs(region string) error { } for _, vpc := range resp.Vpcs { - // delete the vpc - _, err := conn.DeleteVpc(&ec2.DeleteVpcInput{ + input := &ec2.DeleteVpcInput{ VpcId: vpc.VpcId, + } + log.Printf("[DEBUG] Deleting VPC: %s", input) + + // Handle EC2 eventual consistency + err := resource.Retry(1*time.Minute, func() *resource.RetryError { + _, err := conn.DeleteVpc(input) + if isAWSErr(err, "DependencyViolation", "") { + return resource.RetryableError(err) + } + if err != nil { + return resource.NonRetryableError(err) + } + return nil }) + if err != nil { - return fmt.Errorf( - "Error deleting VPC (%s): %s", - *vpc.VpcId, err) + return fmt.Errorf("Error deleting VPC (%s): %s", aws.StringValue(vpc.VpcId), err) } } From 7be15b7d6273e2badbd0a7d2453eee452bcecd7c Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 11 Sep 2018 14:12:29 -0400 Subject: [PATCH 105/184] Update CHANGELOG for #5833 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b49e1d150b4..31cb2a8a528 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ ENHANCEMENTS: * data-source/aws_db_instance: Add `enabled_cloudwatch_logs_exports` attribute [GH-5801] * resource/aws_db_instance: Add `domain` and `domain_iam_role_name` arguments (support for domain joining RDS instances) [GH-5378] +* resource/aws_ecs_task_definition: Suppress `container_definition` differences for equivalent port and host mappings [GH-5833] BUG FIXES: From c76800f4bb7bfd6cca0b705ece55a5c3e7898e6d Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 11 Sep 2018 21:43:24 -0400 Subject: [PATCH 106/184] resource/aws_s3_bucket: Prevent panics with various API read failures and prevent NoSuchBucket error on deletion All changes: * Prevent panic with GetBucketWebsite interface conversion * Prevent panic with GetBucketVersioning interface conversion * Prevent panic with GetBucketAccelerateConfiguration interface conversion * Prevent panic with GetBucketRequestPayment interface conversion * Prevent panic with GetBucketLogging interface conversion * Prevent panic with GetBucketReplication interface conversion * Prevent panic with GetBucketEncryption interface conversion * Prevent panic with GetBucketLocation interface conversion * Return successfully on NoSuchBucket error during deletion * Consistently perform read logic and return more helpful error messages * Refactor awserr logic to use isAWSErr() helper * Split TestAccAWSS3Bucket_Cors for testing stability (eventual consistency issues) and best practices (1 resource.Test per acceptance test) --- aws/resource_aws_s3_bucket.go | 276 +++++++++++++---------------- aws/resource_aws_s3_bucket_test.go | 54 +++--- 2 files changed, 153 insertions(+), 177 deletions(-) diff --git a/aws/resource_aws_s3_bucket.go b/aws/resource_aws_s3_bucket.go index e304cd614ed..6e129978c41 100644 --- a/aws/resource_aws_s3_bucket.go +++ b/aws/resource_aws_s3_bucket.go @@ -649,11 +649,8 @@ func resourceAwsS3BucketRead(d *schema.ResourceData, meta interface{}) error { log.Printf("[WARN] S3 Bucket (%s) not found, error code (404)", d.Id()) d.SetId("") return nil - } else { - // some of the AWS SDK's errors can be empty strings, so let's add - // some additional context. - return fmt.Errorf("error reading S3 bucket \"%s\": %s", d.Id(), err) } + return fmt.Errorf("error reading S3 Bucket (%s): %s", d.Id(), err) } // In the import case, we won't have this @@ -697,21 +694,13 @@ func resourceAwsS3BucketRead(d *schema.ResourceData, meta interface{}) error { Bucket: aws.String(d.Id()), }) }) - if err != nil { - // An S3 Bucket might not have CORS configuration set. - if awsErr, ok := err.(awserr.Error); ok { - if awsErr.Code() != "NoSuchCORSConfiguration" { - return err - } - log.Printf("[WARN] S3 bucket: %s, no CORS configuration could be found.", d.Id()) - } else { - return err - } + if err != nil && !isAWSErr(err, "NoSuchCORSConfiguration", "") { + return fmt.Errorf("error getting S3 Bucket CORS configuration: %s", err) } - cors := corsResponse.(*s3.GetBucketCorsOutput) - log.Printf("[DEBUG] S3 bucket: %s, read CORS: %v", d.Id(), cors) - if cors.CORSRules != nil { - rules := make([]map[string]interface{}, 0, len(cors.CORSRules)) + + corsRules := make([]map[string]interface{}, 0) + if cors, ok := corsResponse.(*s3.GetBucketCorsOutput); ok && len(cors.CORSRules) > 0 { + corsRules = make([]map[string]interface{}, 0, len(cors.CORSRules)) for _, ruleObject := range cors.CORSRules { rule := make(map[string]interface{}) rule["allowed_headers"] = flattenStringList(ruleObject.AllowedHeaders) @@ -724,17 +713,12 @@ func resourceAwsS3BucketRead(d *schema.ResourceData, meta interface{}) error { if ruleObject.MaxAgeSeconds != nil { rule["max_age_seconds"] = int(*ruleObject.MaxAgeSeconds) } - rules = append(rules, rule) - } - if err := d.Set("cors_rule", rules); err != nil { - return err - } - } else { - log.Printf("[DEBUG] S3 bucket: %s, read CORS: %v", d.Id(), cors) - if err := d.Set("cors_rule", make([]map[string]interface{}, 0)); err != nil { - return err + corsRules = append(corsRules, rule) } } + if err := d.Set("cors_rule", corsRules); err != nil { + return fmt.Errorf("error setting cors_rule: %s", err) + } // Read the website configuration wsResponse, err := retryOnAwsCode("NoSuchBucket", func() (interface{}, error) { @@ -742,9 +726,12 @@ func resourceAwsS3BucketRead(d *schema.ResourceData, meta interface{}) error { Bucket: aws.String(d.Id()), }) }) - ws := wsResponse.(*s3.GetBucketWebsiteOutput) - var websites []map[string]interface{} - if err == nil { + if err != nil && !isAWSErr(err, "NotImplemented", "") && !isAWSErr(err, "NoSuchWebsiteConfiguration", "") { + return fmt.Errorf("error getting S3 Bucket website configuration: %s", err) + } + + websites := make([]map[string]interface{}, 0, 1) + if ws, ok := wsResponse.(*s3.GetBucketWebsiteOutput); ok { w := make(map[string]interface{}) if v := ws.IndexDocument; v != nil { @@ -789,10 +776,14 @@ func resourceAwsS3BucketRead(d *schema.ResourceData, meta interface{}) error { w["routing_rules"] = rr } - websites = append(websites, w) + // We have special handling for the website configuration, + // so only add the configuration if there is any + if len(w) > 0 { + websites = append(websites, w) + } } if err := d.Set("website", websites); err != nil { - return err + return fmt.Errorf("error setting website: %s", err) } // Read the versioning configuration @@ -802,13 +793,12 @@ func resourceAwsS3BucketRead(d *schema.ResourceData, meta interface{}) error { Bucket: aws.String(d.Id()), }) }) - versioning := versioningResponse.(*s3.GetBucketVersioningOutput) if err != nil { return err } - log.Printf("[DEBUG] S3 Bucket: %s, versioning: %v", d.Id(), versioning) - if versioning != nil { - vcl := make([]map[string]interface{}, 0, 1) + + vcl := make([]map[string]interface{}, 0, 1) + if versioning, ok := versioningResponse.(*s3.GetBucketVersioningOutput); ok { vc := make(map[string]interface{}) if versioning.Status != nil && *versioning.Status == s3.BucketVersioningStatusEnabled { vc["enabled"] = true @@ -822,9 +812,9 @@ func resourceAwsS3BucketRead(d *schema.ResourceData, meta interface{}) error { vc["mfa_delete"] = false } vcl = append(vcl, vc) - if err := d.Set("versioning", vcl); err != nil { - return err - } + } + if err := d.Set("versioning", vcl); err != nil { + return fmt.Errorf("error setting versioning: %s", err) } // Read the acceleration status @@ -834,25 +824,12 @@ func resourceAwsS3BucketRead(d *schema.ResourceData, meta interface{}) error { Bucket: aws.String(d.Id()), }) }) - accelerate := accelerateResponse.(*s3.GetBucketAccelerateConfigurationOutput) - if err != nil { - // Amazon S3 Transfer Acceleration might not be supported in the - // given region, for example, China (Beijing) and the Government - // Cloud does not support this feature at the moment. - if awsErr, ok := err.(awserr.Error); ok && awsErr.Code() != "UnsupportedArgument" { - return err - } - - var awsRegion string - if region, ok := d.GetOk("region"); ok { - awsRegion = region.(string) - } else { - awsRegion = meta.(*AWSClient).region - } - log.Printf("[WARN] S3 bucket: %s, the S3 Transfer Acceleration is not supported in the region: %s", d.Id(), awsRegion) - } else { - log.Printf("[DEBUG] S3 bucket: %s, read Acceleration: %v", d.Id(), accelerate) + // Amazon S3 Transfer Acceleration might not be supported in the region + if err != nil && !isAWSErr(err, "UnsupportedArgument", "") { + return fmt.Errorf("error getting S3 Bucket acceleration configuration: %s", err) + } + if accelerate, ok := accelerateResponse.(*s3.GetBucketAccelerateConfigurationOutput); ok { d.Set("acceleration_status", accelerate.Status) } @@ -863,15 +840,13 @@ func resourceAwsS3BucketRead(d *schema.ResourceData, meta interface{}) error { Bucket: aws.String(d.Id()), }) }) - payer := payerResponse.(*s3.GetBucketRequestPaymentOutput) + if err != nil { - return err + return fmt.Errorf("error getting S3 Bucket request payment: %s", err) } - log.Printf("[DEBUG] S3 Bucket: %s, read request payer: %v", d.Id(), payer) - if payer.Payer != nil { - if err := d.Set("request_payer", *payer.Payer); err != nil { - return err - } + + if payer, ok := payerResponse.(*s3.GetBucketRequestPaymentOutput); ok { + d.Set("request_payer", payer.Payer) } // Read the logging configuration @@ -880,14 +855,14 @@ func resourceAwsS3BucketRead(d *schema.ResourceData, meta interface{}) error { Bucket: aws.String(d.Id()), }) }) - logging := loggingResponse.(*s3.GetBucketLoggingOutput) + if err != nil { - return err + return fmt.Errorf("error getting S3 Bucket logging: %s", err) } - log.Printf("[DEBUG] S3 Bucket: %s, logging: %v", d.Id(), logging) lcl := make([]map[string]interface{}, 0, 1) - if v := logging.LoggingEnabled; v != nil { + if logging, ok := loggingResponse.(*s3.GetBucketLoggingOutput); ok && logging.LoggingEnabled != nil { + v := logging.LoggingEnabled lc := make(map[string]interface{}) if *v.TargetBucket != "" { lc["target_bucket"] = *v.TargetBucket @@ -898,7 +873,7 @@ func resourceAwsS3BucketRead(d *schema.ResourceData, meta interface{}) error { lcl = append(lcl, lc) } if err := d.Set("logging", lcl); err != nil { - return err + return fmt.Errorf("error setting logging: %s", err) } // Read the lifecycle configuration @@ -908,14 +883,13 @@ func resourceAwsS3BucketRead(d *schema.ResourceData, meta interface{}) error { Bucket: aws.String(d.Id()), }) }) - if err != nil { - if awsError, ok := err.(awserr.RequestFailure); ok && awsError.StatusCode() != 404 { - return err - } + if err != nil && !isAWSErr(err, "NoSuchLifecycleConfiguration", "") { + return err } + + lifecycleRules := make([]map[string]interface{}, 0) if lifecycle, ok := lifecycleResponse.(*s3.GetBucketLifecycleConfigurationOutput); ok && len(lifecycle.Rules) > 0 { - log.Printf("[DEBUG] S3 Bucket: %s, lifecycle: %v", d.Id(), lifecycle) - rules := make([]map[string]interface{}, 0, len(lifecycle.Rules)) + lifecycleRules = make([]map[string]interface{}, 0, len(lifecycle.Rules)) for _, lifecycleRule := range lifecycle.Rules { rule := make(map[string]interface{}) @@ -1019,13 +993,12 @@ func resourceAwsS3BucketRead(d *schema.ResourceData, meta interface{}) error { rule["noncurrent_version_transition"] = schema.NewSet(transitionHash, transitions) } - rules = append(rules, rule) - } - - if err := d.Set("lifecycle_rule", rules); err != nil { - return err + lifecycleRules = append(lifecycleRules, rule) } } + if err := d.Set("lifecycle_rule", lifecycleRules); err != nil { + return fmt.Errorf("error setting lifecycle_rule: %s", err) + } // Read the bucket replication configuration @@ -1034,17 +1007,16 @@ func resourceAwsS3BucketRead(d *schema.ResourceData, meta interface{}) error { Bucket: aws.String(d.Id()), }) }) - if err != nil { - if awsError, ok := err.(awserr.RequestFailure); ok && awsError.StatusCode() != 404 { - return err - } + if err != nil && !isAWSErr(err, "ReplicationConfigurationNotFoundError", "") { + return fmt.Errorf("error getting S3 Bucket replication: %s", err) } - replication := replicationResponse.(*s3.GetBucketReplicationOutput) - log.Printf("[DEBUG] S3 Bucket: %s, read replication configuration: %v", d.Id(), replication) - if err := d.Set("replication_configuration", flattenAwsS3BucketReplicationConfiguration(replication.ReplicationConfiguration)); err != nil { - log.Printf("[DEBUG] Error setting replication configuration: %s", err) - return err + replicationConfiguration := make([]map[string]interface{}, 0) + if replication, ok := replicationResponse.(*s3.GetBucketReplicationOutput); ok { + replicationConfiguration = flattenAwsS3BucketReplicationConfiguration(replication.ReplicationConfiguration) + } + if err := d.Set("replication_configuration", replicationConfiguration); err != nil { + return fmt.Errorf("error setting replication_configuration: %s", err) } // Read the bucket server side encryption configuration @@ -1054,22 +1026,16 @@ func resourceAwsS3BucketRead(d *schema.ResourceData, meta interface{}) error { Bucket: aws.String(d.Id()), }) }) - if err != nil { - if isAWSErr(err, "ServerSideEncryptionConfigurationNotFoundError", "encryption configuration was not found") { - log.Printf("[DEBUG] Default encryption is not enabled for %s", d.Id()) - d.Set("server_side_encryption_configuration", []map[string]interface{}{}) - } else { - return err - } - } else { - encryption := encryptionResponse.(*s3.GetBucketEncryptionOutput) - log.Printf("[DEBUG] S3 Bucket: %s, read encryption configuration: %v", d.Id(), encryption) - if c := encryption.ServerSideEncryptionConfiguration; c != nil { - if err := d.Set("server_side_encryption_configuration", flattenAwsS3ServerSideEncryptionConfiguration(c)); err != nil { - log.Printf("[DEBUG] Error setting server side encryption configuration: %s", err) - return err - } - } + if err != nil && !isAWSErr(err, "ServerSideEncryptionConfigurationNotFoundError", "encryption configuration was not found") { + return fmt.Errorf("error getting S3 Bucket encryption: %s", err) + } + + serverSideEncryptionConfiguration := make([]map[string]interface{}, 0) + if encryption, ok := encryptionResponse.(*s3.GetBucketEncryptionOutput); ok && encryption.ServerSideEncryptionConfiguration != nil { + serverSideEncryptionConfiguration = flattenAwsS3ServerSideEncryptionConfiguration(encryption.ServerSideEncryptionConfiguration) + } + if err := d.Set("server_side_encryption_configuration", serverSideEncryptionConfiguration); err != nil { + return fmt.Errorf("error setting server_side_encryption_configuration: %s", err) } // Add the region as an attribute @@ -1082,11 +1048,11 @@ func resourceAwsS3BucketRead(d *schema.ResourceData, meta interface{}) error { ) }) if err != nil { - return err + return fmt.Errorf("error getting S3 Bucket location: %s", err) } - location := locationResponse.(*s3.GetBucketLocationOutput) + var region string - if location.LocationConstraint != nil { + if location, ok := locationResponse.(*s3.GetBucketLocationOutput); ok && location.LocationConstraint != nil { region = *location.LocationConstraint } region = normalizeRegion(region) @@ -1149,64 +1115,70 @@ func resourceAwsS3BucketDelete(d *schema.ResourceData, meta interface{}) error { _, err := s3conn.DeleteBucket(&s3.DeleteBucketInput{ Bucket: aws.String(d.Id()), }) - if err != nil { - ec2err, ok := err.(awserr.Error) - if ok && ec2err.Code() == "BucketNotEmpty" { - if d.Get("force_destroy").(bool) { - // bucket may have things delete them - log.Printf("[DEBUG] S3 Bucket attempting to forceDestroy %+v", err) - - bucket := d.Get("bucket").(string) - resp, err := s3conn.ListObjectVersions( - &s3.ListObjectVersionsInput{ - Bucket: aws.String(bucket), - }, - ) - if err != nil { - return fmt.Errorf("Error S3 Bucket list Object Versions err: %s", err) - } + if isAWSErr(err, s3.ErrCodeNoSuchBucket, "") { + return nil + } - objectsToDelete := make([]*s3.ObjectIdentifier, 0) + if isAWSErr(err, "BucketNotEmpty", "") { + if d.Get("force_destroy").(bool) { + // bucket may have things delete them + log.Printf("[DEBUG] S3 Bucket attempting to forceDestroy %+v", err) - if len(resp.DeleteMarkers) != 0 { + bucket := d.Get("bucket").(string) + resp, err := s3conn.ListObjectVersions( + &s3.ListObjectVersionsInput{ + Bucket: aws.String(bucket), + }, + ) - for _, v := range resp.DeleteMarkers { - objectsToDelete = append(objectsToDelete, &s3.ObjectIdentifier{ - Key: v.Key, - VersionId: v.VersionId, - }) - } - } + if err != nil { + return fmt.Errorf("Error S3 Bucket list Object Versions err: %s", err) + } - if len(resp.Versions) != 0 { - for _, v := range resp.Versions { - objectsToDelete = append(objectsToDelete, &s3.ObjectIdentifier{ - Key: v.Key, - VersionId: v.VersionId, - }) - } + objectsToDelete := make([]*s3.ObjectIdentifier, 0) + + if len(resp.DeleteMarkers) != 0 { + + for _, v := range resp.DeleteMarkers { + objectsToDelete = append(objectsToDelete, &s3.ObjectIdentifier{ + Key: v.Key, + VersionId: v.VersionId, + }) } + } - params := &s3.DeleteObjectsInput{ - Bucket: aws.String(bucket), - Delete: &s3.Delete{ - Objects: objectsToDelete, - }, + if len(resp.Versions) != 0 { + for _, v := range resp.Versions { + objectsToDelete = append(objectsToDelete, &s3.ObjectIdentifier{ + Key: v.Key, + VersionId: v.VersionId, + }) } + } - _, err = s3conn.DeleteObjects(params) + params := &s3.DeleteObjectsInput{ + Bucket: aws.String(bucket), + Delete: &s3.Delete{ + Objects: objectsToDelete, + }, + } - if err != nil { - return fmt.Errorf("Error S3 Bucket force_destroy error deleting: %s", err) - } + _, err = s3conn.DeleteObjects(params) - // this line recurses until all objects are deleted or an error is returned - return resourceAwsS3BucketDelete(d, meta) + if err != nil { + return fmt.Errorf("Error S3 Bucket force_destroy error deleting: %s", err) } + + // this line recurses until all objects are deleted or an error is returned + return resourceAwsS3BucketDelete(d, meta) } - return fmt.Errorf("Error deleting S3 Bucket: %s %q", err, d.Get("bucket").(string)) } + + if err != nil { + return fmt.Errorf("error deleting S3 Bucket (%s): %s", d.Id(), err) + } + return nil } diff --git a/aws/resource_aws_s3_bucket_test.go b/aws/resource_aws_s3_bucket_test.go index bacd0abe53e..8c9dac00992 100644 --- a/aws/resource_aws_s3_bucket_test.go +++ b/aws/resource_aws_s3_bucket_test.go @@ -522,7 +522,7 @@ func TestAccAWSS3Bucket_Versioning(t *testing.T) { }) } -func TestAccAWSS3Bucket_Cors(t *testing.T) { +func TestAccAWSS3Bucket_Cors_Update(t *testing.T) { rInt := acctest.RandInt() updateBucketCors := func(n string) resource.TestCheckFunc { @@ -545,30 +545,8 @@ func TestAccAWSS3Bucket_Cors(t *testing.T) { }, }, }) - if err != nil { - if awsErr, ok := err.(awserr.Error); ok && awsErr.Code() != "NoSuchCORSConfiguration" { - return err - } - } - return nil - } - } - - deleteBucketCors := func(n string) resource.TestCheckFunc { - return func(s *terraform.State) error { - rs, ok := s.RootModule().Resources[n] - if !ok { - return fmt.Errorf("Not found: %s", n) - } - - conn := testAccProvider.Meta().(*AWSClient).s3conn - _, err := conn.DeleteBucketCors(&s3.DeleteBucketCorsInput{ - Bucket: aws.String(rs.Primary.ID), - }) - if err != nil { - if awsErr, ok := err.(awserr.Error); ok && awsErr.Code() != "NoSuchCORSConfiguration" { - return err - } + if err != nil && !isAWSErr(err, "NoSuchCORSConfiguration", "") { + return err } return nil } @@ -619,6 +597,28 @@ func TestAccAWSS3Bucket_Cors(t *testing.T) { }, }, }) +} + +func TestAccAWSS3Bucket_Cors_Delete(t *testing.T) { + rInt := acctest.RandInt() + + deleteBucketCors := func(n string) resource.TestCheckFunc { + return func(s *terraform.State) error { + rs, ok := s.RootModule().Resources[n] + if !ok { + return fmt.Errorf("Not found: %s", n) + } + + conn := testAccProvider.Meta().(*AWSClient).s3conn + _, err := conn.DeleteBucketCors(&s3.DeleteBucketCorsInput{ + Bucket: aws.String(rs.Primary.ID), + }) + if err != nil && !isAWSErr(err, "NoSuchCORSConfiguration", "") { + return err + } + return nil + } + } resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -635,6 +635,10 @@ func TestAccAWSS3Bucket_Cors(t *testing.T) { }, }, }) +} + +func TestAccAWSS3Bucket_Cors_EmptyOrigin(t *testing.T) { + rInt := acctest.RandInt() resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, From b8f181ace155b5b062c6eedec5004dbaa841c602 Mon Sep 17 00:00:00 2001 From: Gareth Oakley Date: Wed, 12 Sep 2018 09:26:04 +0100 Subject: [PATCH 107/184] vendor: aws/aws-sdk-go@v1.15.33 --- .../aws/aws-sdk-go/aws/endpoints/defaults.go | 48 +- .../github.com/aws/aws-sdk-go/aws/version.go | 2 +- .../aws/aws-sdk-go/service/cloudhsmv2/api.go | 343 +++++ .../aws/aws-sdk-go/service/redshift/api.go | 45 + .../aws/aws-sdk-go/service/ssm/api.go | 1372 ++++++++++++++++- .../aws/aws-sdk-go/service/ssm/errors.go | 9 + vendor/vendor.json | 1026 ++++++------ 7 files changed, 2249 insertions(+), 596 deletions(-) diff --git a/vendor/github.com/aws/aws-sdk-go/aws/endpoints/defaults.go b/vendor/github.com/aws/aws-sdk-go/aws/endpoints/defaults.go index 47952a80ba8..005bde0daaf 100644 --- a/vendor/github.com/aws/aws-sdk-go/aws/endpoints/defaults.go +++ b/vendor/github.com/aws/aws-sdk-go/aws/endpoints/defaults.go @@ -1088,6 +1088,7 @@ var awsPartition = partition{ Endpoints: endpoints{ "ap-northeast-1": endpoint{}, "ap-northeast-2": endpoint{}, + "ap-southeast-1": endpoint{}, "ap-southeast-2": endpoint{}, "eu-central-1": endpoint{}, "eu-west-1": endpoint{}, @@ -1281,6 +1282,7 @@ var awsPartition = partition{ "eu-west-1": endpoint{}, "eu-west-2": endpoint{}, "eu-west-3": endpoint{}, + "sa-east-1": endpoint{}, "us-east-1": endpoint{}, "us-east-2": endpoint{}, "us-west-1": endpoint{}, @@ -2002,6 +2004,7 @@ var awsPartition = partition{ "eu-central-1": endpoint{}, "eu-west-1": endpoint{}, "eu-west-2": endpoint{}, + "eu-west-3": endpoint{}, "sa-east-1": endpoint{}, "us-east-1": endpoint{}, "us-east-1-fips": endpoint{ @@ -2105,11 +2108,16 @@ var awsPartition = partition{ "servicediscovery": service{ Endpoints: endpoints{ - "eu-west-1": endpoint{}, - "us-east-1": endpoint{}, - "us-east-2": endpoint{}, - "us-west-1": endpoint{}, - "us-west-2": endpoint{}, + "ap-northeast-1": endpoint{}, + "ap-southeast-1": endpoint{}, + "ap-southeast-2": endpoint{}, + "eu-central-1": endpoint{}, + "eu-west-1": endpoint{}, + "eu-west-2": endpoint{}, + "us-east-1": endpoint{}, + "us-east-2": endpoint{}, + "us-west-1": endpoint{}, + "us-west-2": endpoint{}, }, }, "shield": service{ @@ -2431,8 +2439,26 @@ var awsPartition = partition{ Endpoints: endpoints{ "eu-west-1": endpoint{}, "us-east-1": endpoint{}, + "us-east-1-fips": endpoint{ + Hostname: "translate-fips.us-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-1", + }, + }, "us-east-2": endpoint{}, + "us-east-2-fips": endpoint{ + Hostname: "translate-fips.us-east-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-2", + }, + }, "us-west-2": endpoint{}, + "us-west-2-fips": endpoint{ + Hostname: "translate-fips.us-west-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-2", + }, + }, }, }, "waf": service{ @@ -2919,6 +2945,12 @@ var awsusgovPartition = partition{ "us-gov-west-1": endpoint{}, }, }, + "application-autoscaling": service{ + + Endpoints: endpoints{ + "us-gov-west-1": endpoint{}, + }, + }, "autoscaling": service{ Endpoints: endpoints{ @@ -3271,6 +3303,12 @@ var awsusgovPartition = partition{ }, Endpoints: endpoints{ "us-gov-west-1": endpoint{}, + "us-gov-west-1-fips": endpoint{ + Hostname: "translate-fips.us-gov-west-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-gov-west-1", + }, + }, }, }, }, diff --git a/vendor/github.com/aws/aws-sdk-go/aws/version.go b/vendor/github.com/aws/aws-sdk-go/aws/version.go index 56436f8c8f7..f98a90c797b 100644 --- a/vendor/github.com/aws/aws-sdk-go/aws/version.go +++ b/vendor/github.com/aws/aws-sdk-go/aws/version.go @@ -5,4 +5,4 @@ package aws const SDKName = "aws-sdk-go" // SDKVersion is the version of this SDK -const SDKVersion = "1.15.31" +const SDKVersion = "1.15.33" diff --git a/vendor/github.com/aws/aws-sdk-go/service/cloudhsmv2/api.go b/vendor/github.com/aws/aws-sdk-go/service/cloudhsmv2/api.go index e2b673426e7..9dc9a67e3b4 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/cloudhsmv2/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/cloudhsmv2/api.go @@ -55,6 +55,8 @@ func (c *CloudHSMV2) CopyBackupToRegionRequest(input *CopyBackupToRegionInput) ( // CopyBackupToRegion API operation for AWS CloudHSM V2. // +// Copy an AWS CloudHSM cluster backup to a different region. +// // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about // the error. @@ -289,6 +291,101 @@ func (c *CloudHSMV2) CreateHsmWithContext(ctx aws.Context, input *CreateHsmInput return out, req.Send() } +const opDeleteBackup = "DeleteBackup" + +// DeleteBackupRequest generates a "aws/request.Request" representing the +// client's request for the DeleteBackup operation. The "output" return +// value will be populated with the request's response once the request completes +// successfuly. +// +// Use "Send" method on the returned Request to send the API call to the service. +// the "output" return value is not valid until after Send returns without error. +// +// See DeleteBackup for more information on using the DeleteBackup +// API call, and error handling. +// +// This method is useful when you want to inject custom logic or configuration +// into the SDK's request lifecycle. Such as custom headers, or retry logic. +// +// +// // Example sending a request using the DeleteBackupRequest method. +// req, resp := client.DeleteBackupRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/cloudhsmv2-2017-04-28/DeleteBackup +func (c *CloudHSMV2) DeleteBackupRequest(input *DeleteBackupInput) (req *request.Request, output *DeleteBackupOutput) { + op := &request.Operation{ + Name: opDeleteBackup, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &DeleteBackupInput{} + } + + output = &DeleteBackupOutput{} + req = c.newRequest(op, input, output) + return +} + +// DeleteBackup API operation for AWS CloudHSM V2. +// +// Deletes a specified AWS CloudHSM backup. A backup can be restored up to 7 +// days after the DeleteBackup request. For more information on restoring a +// backup, see RestoreBackup +// +// Returns awserr.Error for service API and SDK errors. Use runtime type assertions +// with awserr.Error's Code and Message methods to get detailed information about +// the error. +// +// See the AWS API reference guide for AWS CloudHSM V2's +// API operation DeleteBackup for usage and error information. +// +// Returned Error Codes: +// * ErrCodeCloudHsmInternalFailureException "CloudHsmInternalFailureException" +// The request was rejected because of an AWS CloudHSM internal failure. The +// request can be retried. +// +// * ErrCodeCloudHsmServiceException "CloudHsmServiceException" +// The request was rejected because an error occurred. +// +// * ErrCodeCloudHsmResourceNotFoundException "CloudHsmResourceNotFoundException" +// The request was rejected because it refers to a resource that cannot be found. +// +// * ErrCodeCloudHsmInvalidRequestException "CloudHsmInvalidRequestException" +// The request was rejected because it is not a valid request. +// +// * ErrCodeCloudHsmAccessDeniedException "CloudHsmAccessDeniedException" +// The request was rejected because the requester does not have permission to +// perform the requested operation. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/cloudhsmv2-2017-04-28/DeleteBackup +func (c *CloudHSMV2) DeleteBackup(input *DeleteBackupInput) (*DeleteBackupOutput, error) { + req, out := c.DeleteBackupRequest(input) + return out, req.Send() +} + +// DeleteBackupWithContext is the same as DeleteBackup with the addition of +// the ability to pass a context and additional request options. +// +// See DeleteBackup for details on how to use this API operation. +// +// The context must be non-nil and will be used for request cancellation. If +// the context is nil a panic will occur. In the future the SDK may create +// sub-contexts for http.Requests. See https://golang.org/pkg/context/ +// for more information on using Contexts. +func (c *CloudHSMV2) DeleteBackupWithContext(ctx aws.Context, input *DeleteBackupInput, opts ...request.Option) (*DeleteBackupOutput, error) { + req, out := c.DeleteBackupRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opDeleteCluster = "DeleteCluster" // DeleteClusterRequest generates a "aws/request.Request" representing the @@ -1040,6 +1137,100 @@ func (c *CloudHSMV2) ListTagsPagesWithContext(ctx aws.Context, input *ListTagsIn return p.Err() } +const opRestoreBackup = "RestoreBackup" + +// RestoreBackupRequest generates a "aws/request.Request" representing the +// client's request for the RestoreBackup operation. The "output" return +// value will be populated with the request's response once the request completes +// successfuly. +// +// Use "Send" method on the returned Request to send the API call to the service. +// the "output" return value is not valid until after Send returns without error. +// +// See RestoreBackup for more information on using the RestoreBackup +// API call, and error handling. +// +// This method is useful when you want to inject custom logic or configuration +// into the SDK's request lifecycle. Such as custom headers, or retry logic. +// +// +// // Example sending a request using the RestoreBackupRequest method. +// req, resp := client.RestoreBackupRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/cloudhsmv2-2017-04-28/RestoreBackup +func (c *CloudHSMV2) RestoreBackupRequest(input *RestoreBackupInput) (req *request.Request, output *RestoreBackupOutput) { + op := &request.Operation{ + Name: opRestoreBackup, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &RestoreBackupInput{} + } + + output = &RestoreBackupOutput{} + req = c.newRequest(op, input, output) + return +} + +// RestoreBackup API operation for AWS CloudHSM V2. +// +// Restores a specified AWS CloudHSM backup that is in the PENDING_DELETION +// state. For more information on deleting a backup, see DeleteBackup. +// +// Returns awserr.Error for service API and SDK errors. Use runtime type assertions +// with awserr.Error's Code and Message methods to get detailed information about +// the error. +// +// See the AWS API reference guide for AWS CloudHSM V2's +// API operation RestoreBackup for usage and error information. +// +// Returned Error Codes: +// * ErrCodeCloudHsmInternalFailureException "CloudHsmInternalFailureException" +// The request was rejected because of an AWS CloudHSM internal failure. The +// request can be retried. +// +// * ErrCodeCloudHsmServiceException "CloudHsmServiceException" +// The request was rejected because an error occurred. +// +// * ErrCodeCloudHsmResourceNotFoundException "CloudHsmResourceNotFoundException" +// The request was rejected because it refers to a resource that cannot be found. +// +// * ErrCodeCloudHsmInvalidRequestException "CloudHsmInvalidRequestException" +// The request was rejected because it is not a valid request. +// +// * ErrCodeCloudHsmAccessDeniedException "CloudHsmAccessDeniedException" +// The request was rejected because the requester does not have permission to +// perform the requested operation. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/cloudhsmv2-2017-04-28/RestoreBackup +func (c *CloudHSMV2) RestoreBackup(input *RestoreBackupInput) (*RestoreBackupOutput, error) { + req, out := c.RestoreBackupRequest(input) + return out, req.Send() +} + +// RestoreBackupWithContext is the same as RestoreBackup with the addition of +// the ability to pass a context and additional request options. +// +// See RestoreBackup for details on how to use this API operation. +// +// The context must be non-nil and will be used for request cancellation. If +// the context is nil a panic will occur. In the future the SDK may create +// sub-contexts for http.Requests. See https://golang.org/pkg/context/ +// for more information on using Contexts. +func (c *CloudHSMV2) RestoreBackupWithContext(ctx aws.Context, input *RestoreBackupInput, opts ...request.Option) (*RestoreBackupOutput, error) { + req, out := c.RestoreBackupRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opTagResource = "TagResource" // TagResourceRequest generates a "aws/request.Request" representing the @@ -1246,6 +1437,9 @@ type Backup struct { // The date and time when the backup was created. CreateTimestamp *time.Time `type:"timestamp"` + // The date and time when the backup will be permanently deleted. + DeleteTimestamp *time.Time `type:"timestamp"` + SourceBackup *string `type:"string"` SourceCluster *string `type:"string"` @@ -1293,6 +1487,12 @@ func (s *Backup) SetCreateTimestamp(v time.Time) *Backup { return s } +// SetDeleteTimestamp sets the DeleteTimestamp field's value. +func (s *Backup) SetDeleteTimestamp(v time.Time) *Backup { + s.DeleteTimestamp = &v + return s +} + // SetSourceBackup sets the SourceBackup field's value. func (s *Backup) SetSourceBackup(v string) *Backup { s.SourceBackup = &v @@ -1510,9 +1710,13 @@ func (s *Cluster) SetVpcId(v string) *Cluster { type CopyBackupToRegionInput struct { _ struct{} `type:"structure"` + // The ID of the backup that will be copied to the destination region. + // // BackupId is a required field BackupId *string `type:"string" required:"true"` + // The AWS region that will contain your copied CloudHSM cluster backup. + // // DestinationRegion is a required field DestinationRegion *string `type:"string" required:"true"` } @@ -1558,6 +1762,14 @@ func (s *CopyBackupToRegionInput) SetDestinationRegion(v string) *CopyBackupToRe type CopyBackupToRegionOutput struct { _ struct{} `type:"structure"` + // Information on the backup that will be copied to the destination region, + // including CreateTimestamp, SourceBackup, SourceCluster, and Source Region. + // CreateTimestamp of the destination backup will be the same as that of the + // source backup. + // + // You will need to use the sourceBackupID returned in this operation to use + // the DescribeBackups operation on the backup that will be copied to the destination + // region. DestinationBackup *DestinationBackup `type:"structure"` } @@ -1761,6 +1973,68 @@ func (s *CreateHsmOutput) SetHsm(v *Hsm) *CreateHsmOutput { return s } +type DeleteBackupInput struct { + _ struct{} `type:"structure"` + + // The ID of the backup to be deleted. To find the ID of a backup, use the DescribeBackups + // operation. + // + // BackupId is a required field + BackupId *string `type:"string" required:"true"` +} + +// String returns the string representation +func (s DeleteBackupInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DeleteBackupInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *DeleteBackupInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "DeleteBackupInput"} + if s.BackupId == nil { + invalidParams.Add(request.NewErrParamRequired("BackupId")) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetBackupId sets the BackupId field's value. +func (s *DeleteBackupInput) SetBackupId(v string) *DeleteBackupInput { + s.BackupId = &v + return s +} + +type DeleteBackupOutput struct { + _ struct{} `type:"structure"` + + // Information on the Backup object deleted. + Backup *Backup `type:"structure"` +} + +// String returns the string representation +func (s DeleteBackupOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DeleteBackupOutput) GoString() string { + return s.String() +} + +// SetBackup sets the Backup field's value. +func (s *DeleteBackupOutput) SetBackup(v *Backup) *DeleteBackupOutput { + s.Backup = v + return s +} + type DeleteClusterInput struct { _ struct{} `type:"structure"` @@ -1921,6 +2195,10 @@ type DescribeBackupsInput struct { // Use the backupIds filter to return only the specified backups. Specify backups // by their backup identifier (ID). // + // Use the sourceBackupIds filter to return only the backups created from a + // source backup. The sourceBackupID of a source backup is returned by the CopyBackupToRegion + // operation. + // // Use the clusterIds filter to return only the backups for the specified clusters. // Specify clusters by their cluster identifier (ID). // @@ -2456,6 +2734,68 @@ func (s *ListTagsOutput) SetTagList(v []*Tag) *ListTagsOutput { return s } +type RestoreBackupInput struct { + _ struct{} `type:"structure"` + + // The ID of the backup to be restored. To find the ID of a backup, use the + // DescribeBackups operation. + // + // BackupId is a required field + BackupId *string `type:"string" required:"true"` +} + +// String returns the string representation +func (s RestoreBackupInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s RestoreBackupInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *RestoreBackupInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "RestoreBackupInput"} + if s.BackupId == nil { + invalidParams.Add(request.NewErrParamRequired("BackupId")) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetBackupId sets the BackupId field's value. +func (s *RestoreBackupInput) SetBackupId(v string) *RestoreBackupInput { + s.BackupId = &v + return s +} + +type RestoreBackupOutput struct { + _ struct{} `type:"structure"` + + // Information on the Backup object created. + Backup *Backup `type:"structure"` +} + +// String returns the string representation +func (s RestoreBackupOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s RestoreBackupOutput) GoString() string { + return s.String() +} + +// SetBackup sets the Backup field's value. +func (s *RestoreBackupOutput) SetBackup(v *Backup) *RestoreBackupOutput { + s.Backup = v + return s +} + // Contains a tag. A tag is a key-value pair. type Tag struct { _ struct{} `type:"structure"` @@ -2677,6 +3017,9 @@ const ( // BackupStateDeleted is a BackupState enum value BackupStateDeleted = "DELETED" + + // BackupStatePendingDeletion is a BackupState enum value + BackupStatePendingDeletion = "PENDING_DELETION" ) const ( diff --git a/vendor/github.com/aws/aws-sdk-go/service/redshift/api.go b/vendor/github.com/aws/aws-sdk-go/service/redshift/api.go index abf5b5076c8..c57085cf463 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/redshift/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/redshift/api.go @@ -13264,6 +13264,12 @@ type DescribeResizeOutput struct { // Valid Values: multi-node | single-node TargetClusterType *string `type:"string"` + // The type of encryption for the cluster after the resize is complete. + // + // Possible values are KMS and None. In the China region possible values are: + // Legacy and None. + TargetEncryptionType *string `type:"string"` + // The node type that the cluster will have after the resize operation is complete. TargetNodeType *string `type:"string"` @@ -13352,6 +13358,12 @@ func (s *DescribeResizeOutput) SetTargetClusterType(v string) *DescribeResizeOut return s } +// SetTargetEncryptionType sets the TargetEncryptionType field's value. +func (s *DescribeResizeOutput) SetTargetEncryptionType(v string) *DescribeResizeOutput { + s.TargetEncryptionType = &v + return s +} + // SetTargetNodeType sets the TargetNodeType field's value. func (s *DescribeResizeOutput) SetTargetNodeType(v string) *DescribeResizeOutput { s.TargetNodeType = &v @@ -15304,6 +15316,13 @@ type ModifyClusterInput struct { // in the Amazon Redshift Cluster Management Guide. ElasticIp *string `type:"string"` + // Indicates whether the cluster is encrypted. If the cluster is encrypted and + // you provide a value for the KmsKeyId parameter, we will encrypt the cluster + // with the provided KmsKeyId. If you don't provide a KmsKeyId, we will encrypt + // with the default key. In the China region we will use legacy encryption if + // you specify that the cluster is encrypted. + Encrypted *bool `type:"boolean"` + // An option that specifies whether to create the cluster with enhanced VPC // routing enabled. To create a cluster that uses enhanced VPC routing, the // cluster must be in a VPC. For more information, see Enhanced VPC Routing @@ -15323,6 +15342,10 @@ type ModifyClusterInput struct { // the Amazon Redshift cluster can use to retrieve and store keys in an HSM. HsmConfigurationIdentifier *string `type:"string"` + // The AWS Key Management Service (KMS) key ID of the encryption key that you + // want to use to encrypt data in the cluster. + KmsKeyId *string `type:"string"` + // The name for the maintenance track that you want to assign for the cluster. // This name change is asynchronous. The new track name stays in the PendingModifiedValues // for the cluster until the next maintenance window. When the maintenance track @@ -15499,6 +15522,12 @@ func (s *ModifyClusterInput) SetElasticIp(v string) *ModifyClusterInput { return s } +// SetEncrypted sets the Encrypted field's value. +func (s *ModifyClusterInput) SetEncrypted(v bool) *ModifyClusterInput { + s.Encrypted = &v + return s +} + // SetEnhancedVpcRouting sets the EnhancedVpcRouting field's value. func (s *ModifyClusterInput) SetEnhancedVpcRouting(v bool) *ModifyClusterInput { s.EnhancedVpcRouting = &v @@ -15517,6 +15546,12 @@ func (s *ModifyClusterInput) SetHsmConfigurationIdentifier(v string) *ModifyClus return s } +// SetKmsKeyId sets the KmsKeyId field's value. +func (s *ModifyClusterInput) SetKmsKeyId(v string) *ModifyClusterInput { + s.KmsKeyId = &v + return s +} + // SetMaintenanceTrackName sets the MaintenanceTrackName field's value. func (s *ModifyClusterInput) SetMaintenanceTrackName(v string) *ModifyClusterInput { s.MaintenanceTrackName = &v @@ -16127,6 +16162,10 @@ type PendingModifiedValues struct { // The pending or in-progress change of the service version. ClusterVersion *string `type:"string"` + // The encryption type for a cluster. Possible values are: KMS and None. For + // the China region the possible values are None, and Legacy. + EncryptionType *string `type:"string"` + // An option that specifies whether to create the cluster with enhanced VPC // routing enabled. To create a cluster that uses enhanced VPC routing, the // cluster must be in a VPC. For more information, see Enhanced VPC Routing @@ -16190,6 +16229,12 @@ func (s *PendingModifiedValues) SetClusterVersion(v string) *PendingModifiedValu return s } +// SetEncryptionType sets the EncryptionType field's value. +func (s *PendingModifiedValues) SetEncryptionType(v string) *PendingModifiedValues { + s.EncryptionType = &v + return s +} + // SetEnhancedVpcRouting sets the EnhancedVpcRouting field's value. func (s *PendingModifiedValues) SetEnhancedVpcRouting(v bool) *PendingModifiedValues { s.EnhancedVpcRouting = &v diff --git a/vendor/github.com/aws/aws-sdk-go/service/ssm/api.go b/vendor/github.com/aws/aws-sdk-go/service/ssm/api.go index 85f12a98d2a..ddfb5cd5b97 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/ssm/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/ssm/api.go @@ -4685,6 +4685,92 @@ func (c *SSM) DescribePatchGroupsWithContext(ctx aws.Context, input *DescribePat return out, req.Send() } +const opDescribeSessions = "DescribeSessions" + +// DescribeSessionsRequest generates a "aws/request.Request" representing the +// client's request for the DescribeSessions operation. The "output" return +// value will be populated with the request's response once the request completes +// successfuly. +// +// Use "Send" method on the returned Request to send the API call to the service. +// the "output" return value is not valid until after Send returns without error. +// +// See DescribeSessions for more information on using the DescribeSessions +// API call, and error handling. +// +// This method is useful when you want to inject custom logic or configuration +// into the SDK's request lifecycle. Such as custom headers, or retry logic. +// +// +// // Example sending a request using the DescribeSessionsRequest method. +// req, resp := client.DescribeSessionsRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/ssm-2014-11-06/DescribeSessions +func (c *SSM) DescribeSessionsRequest(input *DescribeSessionsInput) (req *request.Request, output *DescribeSessionsOutput) { + op := &request.Operation{ + Name: opDescribeSessions, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &DescribeSessionsInput{} + } + + output = &DescribeSessionsOutput{} + req = c.newRequest(op, input, output) + return +} + +// DescribeSessions API operation for Amazon Simple Systems Manager (SSM). +// +// Retrieves a list of all active sessions (both connected and disconnected) +// or terminated sessions from the past 30 days. +// +// Returns awserr.Error for service API and SDK errors. Use runtime type assertions +// with awserr.Error's Code and Message methods to get detailed information about +// the error. +// +// See the AWS API reference guide for Amazon Simple Systems Manager (SSM)'s +// API operation DescribeSessions for usage and error information. +// +// Returned Error Codes: +// * ErrCodeInternalServerError "InternalServerError" +// An error occurred on the server side. +// +// * ErrCodeInvalidFilterKey "InvalidFilterKey" +// The specified key is not valid. +// +// * ErrCodeInvalidNextToken "InvalidNextToken" +// The specified token is not valid. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/ssm-2014-11-06/DescribeSessions +func (c *SSM) DescribeSessions(input *DescribeSessionsInput) (*DescribeSessionsOutput, error) { + req, out := c.DescribeSessionsRequest(input) + return out, req.Send() +} + +// DescribeSessionsWithContext is the same as DescribeSessions with the addition of +// the ability to pass a context and additional request options. +// +// See DescribeSessions for details on how to use this API operation. +// +// The context must be non-nil and will be used for request cancellation. If +// the context is nil a panic will occur. In the future the SDK may create +// sub-contexts for http.Requests. See https://golang.org/pkg/context/ +// for more information on using Contexts. +func (c *SSM) DescribeSessionsWithContext(ctx aws.Context, input *DescribeSessionsInput, opts ...request.Option) (*DescribeSessionsOutput, error) { + req, out := c.DescribeSessionsRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opGetAutomationExecution = "GetAutomationExecution" // GetAutomationExecutionRequest generates a "aws/request.Request" representing the @@ -4872,6 +4958,86 @@ func (c *SSM) GetCommandInvocationWithContext(ctx aws.Context, input *GetCommand return out, req.Send() } +const opGetConnectionStatus = "GetConnectionStatus" + +// GetConnectionStatusRequest generates a "aws/request.Request" representing the +// client's request for the GetConnectionStatus operation. The "output" return +// value will be populated with the request's response once the request completes +// successfuly. +// +// Use "Send" method on the returned Request to send the API call to the service. +// the "output" return value is not valid until after Send returns without error. +// +// See GetConnectionStatus for more information on using the GetConnectionStatus +// API call, and error handling. +// +// This method is useful when you want to inject custom logic or configuration +// into the SDK's request lifecycle. Such as custom headers, or retry logic. +// +// +// // Example sending a request using the GetConnectionStatusRequest method. +// req, resp := client.GetConnectionStatusRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/ssm-2014-11-06/GetConnectionStatus +func (c *SSM) GetConnectionStatusRequest(input *GetConnectionStatusInput) (req *request.Request, output *GetConnectionStatusOutput) { + op := &request.Operation{ + Name: opGetConnectionStatus, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &GetConnectionStatusInput{} + } + + output = &GetConnectionStatusOutput{} + req = c.newRequest(op, input, output) + return +} + +// GetConnectionStatus API operation for Amazon Simple Systems Manager (SSM). +// +// Retrieves the Session Manager connection status for an instance to determine +// whether it is connected and ready to receive Session Manager connections. +// +// Returns awserr.Error for service API and SDK errors. Use runtime type assertions +// with awserr.Error's Code and Message methods to get detailed information about +// the error. +// +// See the AWS API reference guide for Amazon Simple Systems Manager (SSM)'s +// API operation GetConnectionStatus for usage and error information. +// +// Returned Error Codes: +// * ErrCodeInternalServerError "InternalServerError" +// An error occurred on the server side. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/ssm-2014-11-06/GetConnectionStatus +func (c *SSM) GetConnectionStatus(input *GetConnectionStatusInput) (*GetConnectionStatusOutput, error) { + req, out := c.GetConnectionStatusRequest(input) + return out, req.Send() +} + +// GetConnectionStatusWithContext is the same as GetConnectionStatus with the addition of +// the ability to pass a context and additional request options. +// +// See GetConnectionStatus for details on how to use this API operation. +// +// The context must be non-nil and will be used for request cancellation. If +// the context is nil a panic will occur. In the future the SDK may create +// sub-contexts for http.Requests. See https://golang.org/pkg/context/ +// for more information on using Contexts. +func (c *SSM) GetConnectionStatusWithContext(ctx aws.Context, input *GetConnectionStatusInput, opts ...request.Option) (*GetConnectionStatusOutput, error) { + req, out := c.GetConnectionStatusRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opGetDefaultPatchBaseline = "GetDefaultPatchBaseline" // GetDefaultPatchBaselineRequest generates a "aws/request.Request" representing the @@ -8804,6 +8970,96 @@ func (c *SSM) RemoveTagsFromResourceWithContext(ctx aws.Context, input *RemoveTa return out, req.Send() } +const opResumeSession = "ResumeSession" + +// ResumeSessionRequest generates a "aws/request.Request" representing the +// client's request for the ResumeSession operation. The "output" return +// value will be populated with the request's response once the request completes +// successfuly. +// +// Use "Send" method on the returned Request to send the API call to the service. +// the "output" return value is not valid until after Send returns without error. +// +// See ResumeSession for more information on using the ResumeSession +// API call, and error handling. +// +// This method is useful when you want to inject custom logic or configuration +// into the SDK's request lifecycle. Such as custom headers, or retry logic. +// +// +// // Example sending a request using the ResumeSessionRequest method. +// req, resp := client.ResumeSessionRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/ssm-2014-11-06/ResumeSession +func (c *SSM) ResumeSessionRequest(input *ResumeSessionInput) (req *request.Request, output *ResumeSessionOutput) { + op := &request.Operation{ + Name: opResumeSession, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &ResumeSessionInput{} + } + + output = &ResumeSessionOutput{} + req = c.newRequest(op, input, output) + return +} + +// ResumeSession API operation for Amazon Simple Systems Manager (SSM). +// +// Reconnects a session to an instance after it has been disconnected. Connections +// can be resumed for disconnected sessions, but not terminated sessions. +// +// This command is primarily for use by client machines to automatically reconnect +// during intermittent network issues. It is not intended for any other use. +// +// Returns awserr.Error for service API and SDK errors. Use runtime type assertions +// with awserr.Error's Code and Message methods to get detailed information about +// the error. +// +// See the AWS API reference guide for Amazon Simple Systems Manager (SSM)'s +// API operation ResumeSession for usage and error information. +// +// Returned Error Codes: +// * ErrCodeDoesNotExistException "DoesNotExistException" +// Error returned when the ID specified for a resource, such as a Maintenance +// Window or Patch baseline, doesn't exist. +// +// For information about resource limits in Systems Manager, see AWS Systems +// Manager Limits (http://docs.aws.amazon.com/general/latest/gr/aws_service_limits.html#limits_ssm). +// +// * ErrCodeInternalServerError "InternalServerError" +// An error occurred on the server side. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/ssm-2014-11-06/ResumeSession +func (c *SSM) ResumeSession(input *ResumeSessionInput) (*ResumeSessionOutput, error) { + req, out := c.ResumeSessionRequest(input) + return out, req.Send() +} + +// ResumeSessionWithContext is the same as ResumeSession with the addition of +// the ability to pass a context and additional request options. +// +// See ResumeSession for details on how to use this API operation. +// +// The context must be non-nil and will be used for request cancellation. If +// the context is nil a panic will occur. In the future the SDK may create +// sub-contexts for http.Requests. See https://golang.org/pkg/context/ +// for more information on using Contexts. +func (c *SSM) ResumeSessionWithContext(ctx aws.Context, input *ResumeSessionInput, opts ...request.Option) (*ResumeSessionOutput, error) { + req, out := c.ResumeSessionRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opSendAutomationSignal = "SendAutomationSignal" // SendAutomationSignalRequest generates a "aws/request.Request" representing the @@ -9209,151 +9465,335 @@ func (c *SSM) StartAutomationExecutionWithContext(ctx aws.Context, input *StartA return out, req.Send() } -const opStopAutomationExecution = "StopAutomationExecution" +const opStartSession = "StartSession" -// StopAutomationExecutionRequest generates a "aws/request.Request" representing the -// client's request for the StopAutomationExecution operation. The "output" return +// StartSessionRequest generates a "aws/request.Request" representing the +// client's request for the StartSession operation. The "output" return // value will be populated with the request's response once the request completes // successfuly. // // Use "Send" method on the returned Request to send the API call to the service. // the "output" return value is not valid until after Send returns without error. // -// See StopAutomationExecution for more information on using the StopAutomationExecution +// See StartSession for more information on using the StartSession // API call, and error handling. // // This method is useful when you want to inject custom logic or configuration // into the SDK's request lifecycle. Such as custom headers, or retry logic. // // -// // Example sending a request using the StopAutomationExecutionRequest method. -// req, resp := client.StopAutomationExecutionRequest(params) +// // Example sending a request using the StartSessionRequest method. +// req, resp := client.StartSessionRequest(params) // // err := req.Send() // if err == nil { // resp is now filled // fmt.Println(resp) // } // -// See also, https://docs.aws.amazon.com/goto/WebAPI/ssm-2014-11-06/StopAutomationExecution -func (c *SSM) StopAutomationExecutionRequest(input *StopAutomationExecutionInput) (req *request.Request, output *StopAutomationExecutionOutput) { +// See also, https://docs.aws.amazon.com/goto/WebAPI/ssm-2014-11-06/StartSession +func (c *SSM) StartSessionRequest(input *StartSessionInput) (req *request.Request, output *StartSessionOutput) { op := &request.Operation{ - Name: opStopAutomationExecution, + Name: opStartSession, HTTPMethod: "POST", HTTPPath: "/", } if input == nil { - input = &StopAutomationExecutionInput{} + input = &StartSessionInput{} } - output = &StopAutomationExecutionOutput{} + output = &StartSessionOutput{} req = c.newRequest(op, input, output) return } -// StopAutomationExecution API operation for Amazon Simple Systems Manager (SSM). +// StartSession API operation for Amazon Simple Systems Manager (SSM). // -// Stop an Automation that is currently executing. +// Initiates a connection to a target (for example, an instance) for a Session +// Manager session. Returns a URL and token that can be used to open a WebSocket +// connection for sending input and receiving outputs. +// +// AWS CLI usage: start-session is an interactive command that requires the +// Session Manager plugin to be installed on the client machine making the call. +// For information, see Install the Session Manager Plugin for the AWS CLI +// (http://docs.aws.amazon.com/systems-manager/latest/userguide/session-manager-working-with-install-plugin.html) +// in the AWS Systems Manager User Guide. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about // the error. // // See the AWS API reference guide for Amazon Simple Systems Manager (SSM)'s -// API operation StopAutomationExecution for usage and error information. +// API operation StartSession for usage and error information. // // Returned Error Codes: -// * ErrCodeAutomationExecutionNotFoundException "AutomationExecutionNotFoundException" -// There is no automation execution information for the requested automation -// execution ID. +// * ErrCodeInvalidDocument "InvalidDocument" +// The specified document does not exist. // -// * ErrCodeInvalidAutomationStatusUpdateException "InvalidAutomationStatusUpdateException" -// The specified update status operation is not valid. +// * ErrCodeTargetNotConnected "TargetNotConnected" +// The specified target instance for the session is not fully configured for +// use with Session Manager. For more information, see Getting Started with +// Session Manager (http://docs.aws.amazon.com/systems-manager/latest/userguide/session-manager-getting-started.html) +// in the AWS Systems Manager User Guide. // // * ErrCodeInternalServerError "InternalServerError" // An error occurred on the server side. // -// See also, https://docs.aws.amazon.com/goto/WebAPI/ssm-2014-11-06/StopAutomationExecution -func (c *SSM) StopAutomationExecution(input *StopAutomationExecutionInput) (*StopAutomationExecutionOutput, error) { - req, out := c.StopAutomationExecutionRequest(input) +// See also, https://docs.aws.amazon.com/goto/WebAPI/ssm-2014-11-06/StartSession +func (c *SSM) StartSession(input *StartSessionInput) (*StartSessionOutput, error) { + req, out := c.StartSessionRequest(input) return out, req.Send() } -// StopAutomationExecutionWithContext is the same as StopAutomationExecution with the addition of +// StartSessionWithContext is the same as StartSession with the addition of // the ability to pass a context and additional request options. // -// See StopAutomationExecution for details on how to use this API operation. +// See StartSession for details on how to use this API operation. // // The context must be non-nil and will be used for request cancellation. If // the context is nil a panic will occur. In the future the SDK may create // sub-contexts for http.Requests. See https://golang.org/pkg/context/ // for more information on using Contexts. -func (c *SSM) StopAutomationExecutionWithContext(ctx aws.Context, input *StopAutomationExecutionInput, opts ...request.Option) (*StopAutomationExecutionOutput, error) { - req, out := c.StopAutomationExecutionRequest(input) +func (c *SSM) StartSessionWithContext(ctx aws.Context, input *StartSessionInput, opts ...request.Option) (*StartSessionOutput, error) { + req, out := c.StartSessionRequest(input) req.SetContext(ctx) req.ApplyOptions(opts...) return out, req.Send() } -const opUpdateAssociation = "UpdateAssociation" +const opStopAutomationExecution = "StopAutomationExecution" -// UpdateAssociationRequest generates a "aws/request.Request" representing the -// client's request for the UpdateAssociation operation. The "output" return +// StopAutomationExecutionRequest generates a "aws/request.Request" representing the +// client's request for the StopAutomationExecution operation. The "output" return // value will be populated with the request's response once the request completes // successfuly. // // Use "Send" method on the returned Request to send the API call to the service. // the "output" return value is not valid until after Send returns without error. // -// See UpdateAssociation for more information on using the UpdateAssociation +// See StopAutomationExecution for more information on using the StopAutomationExecution // API call, and error handling. // // This method is useful when you want to inject custom logic or configuration // into the SDK's request lifecycle. Such as custom headers, or retry logic. // // -// // Example sending a request using the UpdateAssociationRequest method. -// req, resp := client.UpdateAssociationRequest(params) +// // Example sending a request using the StopAutomationExecutionRequest method. +// req, resp := client.StopAutomationExecutionRequest(params) // // err := req.Send() // if err == nil { // resp is now filled // fmt.Println(resp) // } // -// See also, https://docs.aws.amazon.com/goto/WebAPI/ssm-2014-11-06/UpdateAssociation -func (c *SSM) UpdateAssociationRequest(input *UpdateAssociationInput) (req *request.Request, output *UpdateAssociationOutput) { +// See also, https://docs.aws.amazon.com/goto/WebAPI/ssm-2014-11-06/StopAutomationExecution +func (c *SSM) StopAutomationExecutionRequest(input *StopAutomationExecutionInput) (req *request.Request, output *StopAutomationExecutionOutput) { op := &request.Operation{ - Name: opUpdateAssociation, + Name: opStopAutomationExecution, HTTPMethod: "POST", HTTPPath: "/", } if input == nil { - input = &UpdateAssociationInput{} + input = &StopAutomationExecutionInput{} } - output = &UpdateAssociationOutput{} + output = &StopAutomationExecutionOutput{} req = c.newRequest(op, input, output) return } -// UpdateAssociation API operation for Amazon Simple Systems Manager (SSM). +// StopAutomationExecution API operation for Amazon Simple Systems Manager (SSM). // -// Updates an association. You can update the association name and version, -// the document version, schedule, parameters, and Amazon S3 output. +// Stop an Automation that is currently executing. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about // the error. // // See the AWS API reference guide for Amazon Simple Systems Manager (SSM)'s -// API operation UpdateAssociation for usage and error information. +// API operation StopAutomationExecution for usage and error information. // // Returned Error Codes: +// * ErrCodeAutomationExecutionNotFoundException "AutomationExecutionNotFoundException" +// There is no automation execution information for the requested automation +// execution ID. +// +// * ErrCodeInvalidAutomationStatusUpdateException "InvalidAutomationStatusUpdateException" +// The specified update status operation is not valid. +// // * ErrCodeInternalServerError "InternalServerError" // An error occurred on the server side. // -// * ErrCodeInvalidSchedule "InvalidSchedule" +// See also, https://docs.aws.amazon.com/goto/WebAPI/ssm-2014-11-06/StopAutomationExecution +func (c *SSM) StopAutomationExecution(input *StopAutomationExecutionInput) (*StopAutomationExecutionOutput, error) { + req, out := c.StopAutomationExecutionRequest(input) + return out, req.Send() +} + +// StopAutomationExecutionWithContext is the same as StopAutomationExecution with the addition of +// the ability to pass a context and additional request options. +// +// See StopAutomationExecution for details on how to use this API operation. +// +// The context must be non-nil and will be used for request cancellation. If +// the context is nil a panic will occur. In the future the SDK may create +// sub-contexts for http.Requests. See https://golang.org/pkg/context/ +// for more information on using Contexts. +func (c *SSM) StopAutomationExecutionWithContext(ctx aws.Context, input *StopAutomationExecutionInput, opts ...request.Option) (*StopAutomationExecutionOutput, error) { + req, out := c.StopAutomationExecutionRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + +const opTerminateSession = "TerminateSession" + +// TerminateSessionRequest generates a "aws/request.Request" representing the +// client's request for the TerminateSession operation. The "output" return +// value will be populated with the request's response once the request completes +// successfuly. +// +// Use "Send" method on the returned Request to send the API call to the service. +// the "output" return value is not valid until after Send returns without error. +// +// See TerminateSession for more information on using the TerminateSession +// API call, and error handling. +// +// This method is useful when you want to inject custom logic or configuration +// into the SDK's request lifecycle. Such as custom headers, or retry logic. +// +// +// // Example sending a request using the TerminateSessionRequest method. +// req, resp := client.TerminateSessionRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/ssm-2014-11-06/TerminateSession +func (c *SSM) TerminateSessionRequest(input *TerminateSessionInput) (req *request.Request, output *TerminateSessionOutput) { + op := &request.Operation{ + Name: opTerminateSession, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &TerminateSessionInput{} + } + + output = &TerminateSessionOutput{} + req = c.newRequest(op, input, output) + return +} + +// TerminateSession API operation for Amazon Simple Systems Manager (SSM). +// +// Permanently ends a session and closes the data connection between the Session +// Manager client and SSM Agent on the instance. A terminated session cannot +// be resumed. +// +// Returns awserr.Error for service API and SDK errors. Use runtime type assertions +// with awserr.Error's Code and Message methods to get detailed information about +// the error. +// +// See the AWS API reference guide for Amazon Simple Systems Manager (SSM)'s +// API operation TerminateSession for usage and error information. +// +// Returned Error Codes: +// * ErrCodeDoesNotExistException "DoesNotExistException" +// Error returned when the ID specified for a resource, such as a Maintenance +// Window or Patch baseline, doesn't exist. +// +// For information about resource limits in Systems Manager, see AWS Systems +// Manager Limits (http://docs.aws.amazon.com/general/latest/gr/aws_service_limits.html#limits_ssm). +// +// * ErrCodeInternalServerError "InternalServerError" +// An error occurred on the server side. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/ssm-2014-11-06/TerminateSession +func (c *SSM) TerminateSession(input *TerminateSessionInput) (*TerminateSessionOutput, error) { + req, out := c.TerminateSessionRequest(input) + return out, req.Send() +} + +// TerminateSessionWithContext is the same as TerminateSession with the addition of +// the ability to pass a context and additional request options. +// +// See TerminateSession for details on how to use this API operation. +// +// The context must be non-nil and will be used for request cancellation. If +// the context is nil a panic will occur. In the future the SDK may create +// sub-contexts for http.Requests. See https://golang.org/pkg/context/ +// for more information on using Contexts. +func (c *SSM) TerminateSessionWithContext(ctx aws.Context, input *TerminateSessionInput, opts ...request.Option) (*TerminateSessionOutput, error) { + req, out := c.TerminateSessionRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + +const opUpdateAssociation = "UpdateAssociation" + +// UpdateAssociationRequest generates a "aws/request.Request" representing the +// client's request for the UpdateAssociation operation. The "output" return +// value will be populated with the request's response once the request completes +// successfuly. +// +// Use "Send" method on the returned Request to send the API call to the service. +// the "output" return value is not valid until after Send returns without error. +// +// See UpdateAssociation for more information on using the UpdateAssociation +// API call, and error handling. +// +// This method is useful when you want to inject custom logic or configuration +// into the SDK's request lifecycle. Such as custom headers, or retry logic. +// +// +// // Example sending a request using the UpdateAssociationRequest method. +// req, resp := client.UpdateAssociationRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/ssm-2014-11-06/UpdateAssociation +func (c *SSM) UpdateAssociationRequest(input *UpdateAssociationInput) (req *request.Request, output *UpdateAssociationOutput) { + op := &request.Operation{ + Name: opUpdateAssociation, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &UpdateAssociationInput{} + } + + output = &UpdateAssociationOutput{} + req = c.newRequest(op, input, output) + return +} + +// UpdateAssociation API operation for Amazon Simple Systems Manager (SSM). +// +// Updates an association. You can update the association name and version, +// the document version, schedule, parameters, and Amazon S3 output. +// +// Returns awserr.Error for service API and SDK errors. Use runtime type assertions +// with awserr.Error's Code and Message methods to get detailed information about +// the error. +// +// See the AWS API reference guide for Amazon Simple Systems Manager (SSM)'s +// API operation UpdateAssociation for usage and error information. +// +// Returned Error Codes: +// * ErrCodeInternalServerError "InternalServerError" +// An error occurred on the server side. +// +// * ErrCodeInvalidSchedule "InvalidSchedule" // The schedule is invalid. Verify your cron or rate expression and try again. // // * ErrCodeInvalidParameters "InvalidParameters" @@ -12168,7 +12608,44 @@ type CommandFilter struct { // Key is a required field Key *string `locationName:"key" type:"string" required:"true" enum:"CommandFilterKey"` - // The filter value. + // The filter value. Valid values for each filter key are as follows: + // + // * InvokedAfter: A timestamp to limit your results. For example, specify + // 2018-07-07T00:00:00Z to see results occurring July 7, 2018, and later. + // + // * InvokedBefore: A timestamp to limit your results. For example, specify + // 2018-07-07T00:00:00Z to see results before July 7, 2018. + // + // * Status: Specify a valid command status to see a list of all command + // executions with that status. Status values you can specify include: + // + // Pending + // + // InProgress + // + // Success + // + // Cancelled + // + // Failed + // + // TimedOut + // + // Cancelling + // + // * DocumentName: The name of the SSM document for which you want to see + // command results. + // + // For example, specify AWS-RunPatchBaseline to see command executions that + // used this SSM document to perform security patching operations on instances. + // + // + // * ExecutionStage: An enum whose value can be either Executing or Complete. + // + // Specify Executing to see a list of command executions that are currently + // still running. + // + // Specify Complete to see a list of command exeuctions that have already completed. // // Value is a required field Value *string `locationName:"value" min:"1" type:"string" required:"true"` @@ -16200,7 +16677,14 @@ type DescribeInstanceInformationInput struct { // One or more filters. Use a filter to return a more specific list of instances. Filters []*InstanceInformationStringFilter `type:"list"` - // One or more filters. Use a filter to return a more specific list of instances. + // This is a legacy method. We recommend that you don't use this method. Instead, + // use the InstanceInformationFilter action. The InstanceInformationFilter action + // enables you to return instance information by using tags that are specified + // as a key-value mapping. + // + // If you do use this method, then you can't use the InstanceInformationFilter + // action. Using this method and the InstanceInformationFilter action causes + // an exception error. InstanceInformationFilterList []*InstanceInformationFilter `type:"list"` // The maximum number of items to return for this call. The call also returns @@ -17901,64 +18385,181 @@ func (s *DescribePatchGroupsOutput) SetNextToken(v string) *DescribePatchGroupsO return s } -// A default version of a document. -type DocumentDefaultVersionDescription struct { +type DescribeSessionsInput struct { _ struct{} `type:"structure"` - // The default version of the document. - DefaultVersion *string `type:"string"` + // One or more filters to limit the type of sessions returned by the request. + Filters []*SessionFilter `min:"1" type:"list"` - // The name of the document. - Name *string `type:"string"` + // The maximum number of items to return for this call. The call also returns + // a token that you can specify in a subsequent call to get the next set of + // results. + MaxResults *int64 `min:"1" type:"integer"` + + // The token for the next set of items to return. (You received this token from + // a previous call.) + NextToken *string `type:"string"` + + // The session status to retrieve a list of sessions for. For example, "active". + // + // State is a required field + State *string `type:"string" required:"true" enum:"SessionState"` } // String returns the string representation -func (s DocumentDefaultVersionDescription) String() string { +func (s DescribeSessionsInput) String() string { return awsutil.Prettify(s) } // GoString returns the string representation -func (s DocumentDefaultVersionDescription) GoString() string { +func (s DescribeSessionsInput) GoString() string { return s.String() } -// SetDefaultVersion sets the DefaultVersion field's value. -func (s *DocumentDefaultVersionDescription) SetDefaultVersion(v string) *DocumentDefaultVersionDescription { - s.DefaultVersion = &v +// Validate inspects the fields of the type to determine if they are valid. +func (s *DescribeSessionsInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "DescribeSessionsInput"} + if s.Filters != nil && len(s.Filters) < 1 { + invalidParams.Add(request.NewErrParamMinLen("Filters", 1)) + } + if s.MaxResults != nil && *s.MaxResults < 1 { + invalidParams.Add(request.NewErrParamMinValue("MaxResults", 1)) + } + if s.State == nil { + invalidParams.Add(request.NewErrParamRequired("State")) + } + if s.Filters != nil { + for i, v := range s.Filters { + if v == nil { + continue + } + if err := v.Validate(); err != nil { + invalidParams.AddNested(fmt.Sprintf("%s[%v]", "Filters", i), err.(request.ErrInvalidParams)) + } + } + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetFilters sets the Filters field's value. +func (s *DescribeSessionsInput) SetFilters(v []*SessionFilter) *DescribeSessionsInput { + s.Filters = v return s } -// SetName sets the Name field's value. -func (s *DocumentDefaultVersionDescription) SetName(v string) *DocumentDefaultVersionDescription { - s.Name = &v +// SetMaxResults sets the MaxResults field's value. +func (s *DescribeSessionsInput) SetMaxResults(v int64) *DescribeSessionsInput { + s.MaxResults = &v return s } -// Describes a Systems Manager document. -type DocumentDescription struct { - _ struct{} `type:"structure"` +// SetNextToken sets the NextToken field's value. +func (s *DescribeSessionsInput) SetNextToken(v string) *DescribeSessionsInput { + s.NextToken = &v + return s +} - // The date when the document was created. - CreatedDate *time.Time `type:"timestamp"` +// SetState sets the State field's value. +func (s *DescribeSessionsInput) SetState(v string) *DescribeSessionsInput { + s.State = &v + return s +} - // The default version. - DefaultVersion *string `type:"string"` +type DescribeSessionsOutput struct { + _ struct{} `type:"structure"` - // A description of the document. - Description *string `type:"string"` + // The token for the next set of items to return. (You received this token from + // a previous call.) + NextToken *string `type:"string"` - // The document format, either JSON or YAML. - DocumentFormat *string `type:"string" enum:"DocumentFormat"` + // A list of sessions meeting the request parameters. + Sessions []*Session `type:"list"` +} - // The type of document. - DocumentType *string `type:"string" enum:"DocumentType"` +// String returns the string representation +func (s DescribeSessionsOutput) String() string { + return awsutil.Prettify(s) +} - // The document version. - DocumentVersion *string `type:"string"` +// GoString returns the string representation +func (s DescribeSessionsOutput) GoString() string { + return s.String() +} - // The Sha256 or Sha1 hash created by the system when the document was created. - // - // Sha1 hashes have been deprecated. +// SetNextToken sets the NextToken field's value. +func (s *DescribeSessionsOutput) SetNextToken(v string) *DescribeSessionsOutput { + s.NextToken = &v + return s +} + +// SetSessions sets the Sessions field's value. +func (s *DescribeSessionsOutput) SetSessions(v []*Session) *DescribeSessionsOutput { + s.Sessions = v + return s +} + +// A default version of a document. +type DocumentDefaultVersionDescription struct { + _ struct{} `type:"structure"` + + // The default version of the document. + DefaultVersion *string `type:"string"` + + // The name of the document. + Name *string `type:"string"` +} + +// String returns the string representation +func (s DocumentDefaultVersionDescription) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DocumentDefaultVersionDescription) GoString() string { + return s.String() +} + +// SetDefaultVersion sets the DefaultVersion field's value. +func (s *DocumentDefaultVersionDescription) SetDefaultVersion(v string) *DocumentDefaultVersionDescription { + s.DefaultVersion = &v + return s +} + +// SetName sets the Name field's value. +func (s *DocumentDefaultVersionDescription) SetName(v string) *DocumentDefaultVersionDescription { + s.Name = &v + return s +} + +// Describes a Systems Manager document. +type DocumentDescription struct { + _ struct{} `type:"structure"` + + // The date when the document was created. + CreatedDate *time.Time `type:"timestamp"` + + // The default version. + DefaultVersion *string `type:"string"` + + // A description of the document. + Description *string `type:"string"` + + // The document format, either JSON or YAML. + DocumentFormat *string `type:"string" enum:"DocumentFormat"` + + // The type of document. + DocumentType *string `type:"string" enum:"DocumentType"` + + // The document version. + DocumentVersion *string `type:"string"` + + // The Sha256 or Sha1 hash created by the system when the document was created. + // + // Sha1 hashes have been deprecated. Hash *string `type:"string"` // Sha256 or Sha1. @@ -18957,6 +19558,80 @@ func (s *GetCommandInvocationOutput) SetStatusDetails(v string) *GetCommandInvoc return s } +type GetConnectionStatusInput struct { + _ struct{} `type:"structure"` + + // The ID of the instance. + // + // Target is a required field + Target *string `min:"1" type:"string" required:"true"` +} + +// String returns the string representation +func (s GetConnectionStatusInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s GetConnectionStatusInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *GetConnectionStatusInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "GetConnectionStatusInput"} + if s.Target == nil { + invalidParams.Add(request.NewErrParamRequired("Target")) + } + if s.Target != nil && len(*s.Target) < 1 { + invalidParams.Add(request.NewErrParamMinLen("Target", 1)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetTarget sets the Target field's value. +func (s *GetConnectionStatusInput) SetTarget(v string) *GetConnectionStatusInput { + s.Target = &v + return s +} + +type GetConnectionStatusOutput struct { + _ struct{} `type:"structure"` + + // The status of the connection to the instance. For example, 'Connected' or + // 'Not Connected'. + Status *string `type:"string" enum:"ConnectionStatus"` + + // The ID of the instance to check connection status. + Target *string `min:"1" type:"string"` +} + +// String returns the string representation +func (s GetConnectionStatusOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s GetConnectionStatusOutput) GoString() string { + return s.String() +} + +// SetStatus sets the Status field's value. +func (s *GetConnectionStatusOutput) SetStatus(v string) *GetConnectionStatusOutput { + s.Status = &v + return s +} + +// SetTarget sets the Target field's value. +func (s *GetConnectionStatusOutput) SetTarget(v string) *GetConnectionStatusOutput { + s.Target = &v + return s +} + type GetDefaultPatchBaselineInput struct { _ struct{} `type:"structure"` @@ -21517,7 +22192,12 @@ func (s *InstanceInformation) SetResourceType(v string) *InstanceInformation { return s } -// Describes a filter for a specific list of instances. +// Describes a filter for a specific list of instances. You can filter instances +// information by using tags. You specify tags by using a key-value mapping. +// +// Use this action instead of the DescribeInstanceInformationRequest$InstanceInformationFilterList +// method. The InstanceInformationFilterList method is a legacy method and does +// not support tags. type InstanceInformationFilter struct { _ struct{} `type:"structure"` @@ -28358,6 +29038,98 @@ func (s *ResultAttribute) SetTypeName(v string) *ResultAttribute { return s } +type ResumeSessionInput struct { + _ struct{} `type:"structure"` + + // The ID of the disconnected session to resume. + // + // SessionId is a required field + SessionId *string `min:"1" type:"string" required:"true"` +} + +// String returns the string representation +func (s ResumeSessionInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s ResumeSessionInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *ResumeSessionInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "ResumeSessionInput"} + if s.SessionId == nil { + invalidParams.Add(request.NewErrParamRequired("SessionId")) + } + if s.SessionId != nil && len(*s.SessionId) < 1 { + invalidParams.Add(request.NewErrParamMinLen("SessionId", 1)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetSessionId sets the SessionId field's value. +func (s *ResumeSessionInput) SetSessionId(v string) *ResumeSessionInput { + s.SessionId = &v + return s +} + +type ResumeSessionOutput struct { + _ struct{} `type:"structure"` + + // The ID of the session. + SessionId *string `min:"1" type:"string"` + + // A URL back to SSM Agent on the instance that the Session Manager client uses + // to send commands and receive output from the instance. Format: wss://ssm-messages.region.amazonaws.com/v1/data-channel/session-id?stream=(input|output). + // + // region represents the Region identifier for an AWS Region supported by AWS + // Systems Manager, such as us-east-2 for the US East (Ohio) Region. For a list + // of supported region values, see the Region column in the AWS Systems Manager + // table of regions and endpoints (http://docs.aws.amazon.com/general/latest/gr/rande.html#ssm_region) + // in the AWS General Reference. + // + // session-id represents the ID of a Session Manager session, such as 1a2b3c4dEXAMPLE. + StreamUrl *string `type:"string"` + + // An encrypted token value containing session and caller information. Used + // to authenticate the connection to the instance. + TokenValue *string `type:"string"` +} + +// String returns the string representation +func (s ResumeSessionOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s ResumeSessionOutput) GoString() string { + return s.String() +} + +// SetSessionId sets the SessionId field's value. +func (s *ResumeSessionOutput) SetSessionId(v string) *ResumeSessionOutput { + s.SessionId = &v + return s +} + +// SetStreamUrl sets the StreamUrl field's value. +func (s *ResumeSessionOutput) SetStreamUrl(v string) *ResumeSessionOutput { + s.StreamUrl = &v + return s +} + +// SetTokenValue sets the TokenValue field's value. +func (s *ResumeSessionOutput) SetTokenValue(v string) *ResumeSessionOutput { + s.TokenValue = &v + return s +} + // An Amazon S3 bucket where you want to store the results of this request. type S3OutputLocation struct { _ struct{} `type:"structure"` @@ -28802,6 +29574,220 @@ func (s *SendCommandOutput) SetCommand(v *Command) *SendCommandOutput { return s } +// Information about a Session Manager connection to an instance. +type Session struct { + _ struct{} `type:"structure"` + + // Reserved for future use. + Details *string `min:"1" type:"string"` + + // The name of the Session Manager SSM document used to define the parameters + // and plugin settings for the session. For example, SSM-SessionManagerRunShell. + DocumentName *string `type:"string"` + + // The date and time, in ISO-8601 Extended format, when the session was terminated. + EndDate *time.Time `type:"timestamp"` + + // Reserved for future use. + OutputUrl *SessionManagerOutputUrl `type:"structure"` + + // The ID of the AWS user account that started the session. + Owner *string `min:"1" type:"string"` + + // The ID of the session. + SessionId *string `min:"1" type:"string"` + + // The date and time, in ISO-8601 Extended format, when the session began. + StartDate *time.Time `type:"timestamp"` + + // The status of the session. For example, "Connected" or "Terminated". + Status *string `type:"string" enum:"SessionStatus"` + + // The instance that the Session Manager session connected to. + Target *string `min:"1" type:"string"` +} + +// String returns the string representation +func (s Session) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s Session) GoString() string { + return s.String() +} + +// SetDetails sets the Details field's value. +func (s *Session) SetDetails(v string) *Session { + s.Details = &v + return s +} + +// SetDocumentName sets the DocumentName field's value. +func (s *Session) SetDocumentName(v string) *Session { + s.DocumentName = &v + return s +} + +// SetEndDate sets the EndDate field's value. +func (s *Session) SetEndDate(v time.Time) *Session { + s.EndDate = &v + return s +} + +// SetOutputUrl sets the OutputUrl field's value. +func (s *Session) SetOutputUrl(v *SessionManagerOutputUrl) *Session { + s.OutputUrl = v + return s +} + +// SetOwner sets the Owner field's value. +func (s *Session) SetOwner(v string) *Session { + s.Owner = &v + return s +} + +// SetSessionId sets the SessionId field's value. +func (s *Session) SetSessionId(v string) *Session { + s.SessionId = &v + return s +} + +// SetStartDate sets the StartDate field's value. +func (s *Session) SetStartDate(v time.Time) *Session { + s.StartDate = &v + return s +} + +// SetStatus sets the Status field's value. +func (s *Session) SetStatus(v string) *Session { + s.Status = &v + return s +} + +// SetTarget sets the Target field's value. +func (s *Session) SetTarget(v string) *Session { + s.Target = &v + return s +} + +// Describes a filter for Session Manager information. +type SessionFilter struct { + _ struct{} `type:"structure"` + + // The name of the filter. + // + // Key is a required field + Key *string `locationName:"key" type:"string" required:"true" enum:"SessionFilterKey"` + + // The filter value. Valid values for each filter key are as follows: + // + // * InvokedAfter: Specify a timestamp to limit your results. For example, + // specify 2018-08-29T00:00:00Z to see sessions that started August 29, 2018, + // and later. + // + // * InvokedBefore: Specify a timestamp to limit your results. For example, + // specify 2018-08-29T00:00:00Z to see sessions that started before August + // 29, 2018. + // + // * Target: Specify an instance to which session connections have been made. + // + // * Owner: Specify an AWS user account to see a list of sessions started + // by that user. + // + // * Status: Specify a valid session status to see a list of all sessions + // with that status. Status values you can specify include: + // + // Connected + // + // Connecting + // + // Disconnected + // + // Terminated + // + // Terminating + // + // Failed + // + // Value is a required field + Value *string `locationName:"value" min:"1" type:"string" required:"true"` +} + +// String returns the string representation +func (s SessionFilter) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s SessionFilter) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *SessionFilter) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "SessionFilter"} + if s.Key == nil { + invalidParams.Add(request.NewErrParamRequired("Key")) + } + if s.Value == nil { + invalidParams.Add(request.NewErrParamRequired("Value")) + } + if s.Value != nil && len(*s.Value) < 1 { + invalidParams.Add(request.NewErrParamMinLen("Value", 1)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetKey sets the Key field's value. +func (s *SessionFilter) SetKey(v string) *SessionFilter { + s.Key = &v + return s +} + +// SetValue sets the Value field's value. +func (s *SessionFilter) SetValue(v string) *SessionFilter { + s.Value = &v + return s +} + +// Reserved for future use. +type SessionManagerOutputUrl struct { + _ struct{} `type:"structure"` + + // Reserved for future use. + CloudWatchOutputUrl *string `min:"1" type:"string"` + + // Reserved for future use. + S3OutputUrl *string `min:"1" type:"string"` +} + +// String returns the string representation +func (s SessionManagerOutputUrl) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s SessionManagerOutputUrl) GoString() string { + return s.String() +} + +// SetCloudWatchOutputUrl sets the CloudWatchOutputUrl field's value. +func (s *SessionManagerOutputUrl) SetCloudWatchOutputUrl(v string) *SessionManagerOutputUrl { + s.CloudWatchOutputUrl = &v + return s +} + +// SetS3OutputUrl sets the S3OutputUrl field's value. +func (s *SessionManagerOutputUrl) SetS3OutputUrl(v string) *SessionManagerOutputUrl { + s.S3OutputUrl = &v + return s +} + // The number of managed instances found for each patch severity level defined // in the request filter. type SeveritySummary struct { @@ -29126,6 +30112,118 @@ func (s *StartAutomationExecutionOutput) SetAutomationExecutionId(v string) *Sta return s } +type StartSessionInput struct { + _ struct{} `type:"structure"` + + // The name of the SSM document to define the parameters and plugin settings + // for the session. For example, SSM-SessionManagerRunShell. If no document + // name is provided, a shell to the instance is launched by default. + DocumentName *string `type:"string"` + + // Reserved for future use. + Parameters map[string][]*string `type:"map"` + + // The instance to connect to for the session. + // + // Target is a required field + Target *string `min:"1" type:"string" required:"true"` +} + +// String returns the string representation +func (s StartSessionInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s StartSessionInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *StartSessionInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "StartSessionInput"} + if s.Target == nil { + invalidParams.Add(request.NewErrParamRequired("Target")) + } + if s.Target != nil && len(*s.Target) < 1 { + invalidParams.Add(request.NewErrParamMinLen("Target", 1)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetDocumentName sets the DocumentName field's value. +func (s *StartSessionInput) SetDocumentName(v string) *StartSessionInput { + s.DocumentName = &v + return s +} + +// SetParameters sets the Parameters field's value. +func (s *StartSessionInput) SetParameters(v map[string][]*string) *StartSessionInput { + s.Parameters = v + return s +} + +// SetTarget sets the Target field's value. +func (s *StartSessionInput) SetTarget(v string) *StartSessionInput { + s.Target = &v + return s +} + +type StartSessionOutput struct { + _ struct{} `type:"structure"` + + // The ID of the session. + SessionId *string `min:"1" type:"string"` + + // A URL back to SSM Agent on the instance that the Session Manager client uses + // to send commands and receive output from the instance. Format: wss://ssm-messages.region.amazonaws.com/v1/data-channel/session-id?stream=(input|output) + // + // region represents the Region identifier for an AWS Region supported by AWS + // Systems Manager, such as us-east-2 for the US East (Ohio) Region. For a list + // of supported region values, see the Region column in the AWS Systems Manager + // table of regions and endpoints (http://docs.aws.amazon.com/general/latest/gr/rande.html#ssm_region) + // in the AWS General Reference. + // + // session-id represents the ID of a Session Manager session, such as 1a2b3c4dEXAMPLE. + StreamUrl *string `type:"string"` + + // An encrypted token value containing session and caller information. Used + // to authenticate the connection to the instance. + TokenValue *string `type:"string"` +} + +// String returns the string representation +func (s StartSessionOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s StartSessionOutput) GoString() string { + return s.String() +} + +// SetSessionId sets the SessionId field's value. +func (s *StartSessionOutput) SetSessionId(v string) *StartSessionOutput { + s.SessionId = &v + return s +} + +// SetStreamUrl sets the StreamUrl field's value. +func (s *StartSessionOutput) SetStreamUrl(v string) *StartSessionOutput { + s.StreamUrl = &v + return s +} + +// SetTokenValue sets the TokenValue field's value. +func (s *StartSessionOutput) SetTokenValue(v string) *StartSessionOutput { + s.TokenValue = &v + return s +} + // Detailed information about an the execution state of an Automation step. type StepExecution struct { _ struct{} `type:"structure"` @@ -29575,6 +30673,70 @@ func (s *Target) SetValues(v []*string) *Target { return s } +type TerminateSessionInput struct { + _ struct{} `type:"structure"` + + // The ID of the session to terminate. + // + // SessionId is a required field + SessionId *string `min:"1" type:"string" required:"true"` +} + +// String returns the string representation +func (s TerminateSessionInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s TerminateSessionInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *TerminateSessionInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "TerminateSessionInput"} + if s.SessionId == nil { + invalidParams.Add(request.NewErrParamRequired("SessionId")) + } + if s.SessionId != nil && len(*s.SessionId) < 1 { + invalidParams.Add(request.NewErrParamMinLen("SessionId", 1)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetSessionId sets the SessionId field's value. +func (s *TerminateSessionInput) SetSessionId(v string) *TerminateSessionInput { + s.SessionId = &v + return s +} + +type TerminateSessionOutput struct { + _ struct{} `type:"structure"` + + // The ID of the session that has been terminated. + SessionId *string `min:"1" type:"string"` +} + +// String returns the string representation +func (s TerminateSessionOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s TerminateSessionOutput) GoString() string { + return s.String() +} + +// SetSessionId sets the SessionId field's value. +func (s *TerminateSessionOutput) SetSessionId(v string) *TerminateSessionOutput { + s.SessionId = &v + return s +} + type UpdateAssociationInput struct { _ struct{} `type:"structure"` @@ -31414,6 +32576,14 @@ const ( ComplianceStatusNonCompliant = "NON_COMPLIANT" ) +const ( + // ConnectionStatusConnected is a ConnectionStatus enum value + ConnectionStatusConnected = "Connected" + + // ConnectionStatusNotConnected is a ConnectionStatus enum value + ConnectionStatusNotConnected = "NotConnected" +) + const ( // DescribeActivationsFilterKeysActivationIds is a DescribeActivationsFilterKeys enum value DescribeActivationsFilterKeysActivationIds = "ActivationIds" @@ -31491,6 +32661,9 @@ const ( // DocumentTypeAutomation is a DocumentType enum value DocumentTypeAutomation = "Automation" + + // DocumentTypeSession is a DocumentType enum value + DocumentTypeSession = "Session" ) const ( @@ -31859,6 +33032,51 @@ const ( ResourceTypeForTaggingPatchBaseline = "PatchBaseline" ) +const ( + // SessionFilterKeyInvokedAfter is a SessionFilterKey enum value + SessionFilterKeyInvokedAfter = "InvokedAfter" + + // SessionFilterKeyInvokedBefore is a SessionFilterKey enum value + SessionFilterKeyInvokedBefore = "InvokedBefore" + + // SessionFilterKeyTarget is a SessionFilterKey enum value + SessionFilterKeyTarget = "Target" + + // SessionFilterKeyOwner is a SessionFilterKey enum value + SessionFilterKeyOwner = "Owner" + + // SessionFilterKeyStatus is a SessionFilterKey enum value + SessionFilterKeyStatus = "Status" +) + +const ( + // SessionStateActive is a SessionState enum value + SessionStateActive = "Active" + + // SessionStateHistory is a SessionState enum value + SessionStateHistory = "History" +) + +const ( + // SessionStatusConnected is a SessionStatus enum value + SessionStatusConnected = "Connected" + + // SessionStatusConnecting is a SessionStatus enum value + SessionStatusConnecting = "Connecting" + + // SessionStatusDisconnected is a SessionStatus enum value + SessionStatusDisconnected = "Disconnected" + + // SessionStatusTerminated is a SessionStatus enum value + SessionStatusTerminated = "Terminated" + + // SessionStatusTerminating is a SessionStatus enum value + SessionStatusTerminating = "Terminating" + + // SessionStatusFailed is a SessionStatus enum value + SessionStatusFailed = "Failed" +) + const ( // SignalTypeApprove is a SignalType enum value SignalTypeApprove = "Approve" diff --git a/vendor/github.com/aws/aws-sdk-go/service/ssm/errors.go b/vendor/github.com/aws/aws-sdk-go/service/ssm/errors.go index 0c4e6cebda5..da7ff9e647c 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/ssm/errors.go +++ b/vendor/github.com/aws/aws-sdk-go/service/ssm/errors.go @@ -610,6 +610,15 @@ const ( // operation, but the target is still referenced in a task. ErrCodeTargetInUseException = "TargetInUseException" + // ErrCodeTargetNotConnected for service response error code + // "TargetNotConnected". + // + // The specified target instance for the session is not fully configured for + // use with Session Manager. For more information, see Getting Started with + // Session Manager (http://docs.aws.amazon.com/systems-manager/latest/userguide/session-manager-getting-started.html) + // in the AWS Systems Manager User Guide. + ErrCodeTargetNotConnected = "TargetNotConnected" + // ErrCodeTooManyTagsError for service response error code // "TooManyTagsError". // diff --git a/vendor/vendor.json b/vendor/vendor.json index f97c0843a16..ba5eaf61b90 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -47,1020 +47,1020 @@ "versionExact": "v1.0.0" }, { - "checksumSHA1": "5euD4kqTIy6wSZq3vFisE2XW+d0=", + "checksumSHA1": "emeY6B3JPyd8nlWsaIWSEWqkJyQ=", "path": "github.com/aws/aws-sdk-go/aws", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "DtuTqKH29YnLjrIJkRYX0HQtXY0=", "path": "github.com/aws/aws-sdk-go/aws/arn", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "Y9W+4GimK4Fuxq+vyIskVYFRnX4=", "path": "github.com/aws/aws-sdk-go/aws/awserr", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "yyYr41HZ1Aq0hWc3J5ijXwYEcac=", "path": "github.com/aws/aws-sdk-go/aws/awsutil", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "EwL79Cq6euk+EV/t/n2E+jzPNmU=", "path": "github.com/aws/aws-sdk-go/aws/client", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "uEJU4I6dTKaraQKvrljlYKUZwoc=", "path": "github.com/aws/aws-sdk-go/aws/client/metadata", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "vVSUnICaD9IaBQisCfw0n8zLwig=", "path": "github.com/aws/aws-sdk-go/aws/corehandlers", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "I87y3G8r14yKZQ5NlkupFUJ5jW0=", "path": "github.com/aws/aws-sdk-go/aws/credentials", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "JTilCBYWVAfhbKSnrxCNhE8IFns=", "path": "github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "NUJUTWlc1sV8b7WjfiYc4JZbXl0=", "path": "github.com/aws/aws-sdk-go/aws/credentials/endpointcreds", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "JEYqmF83O5n5bHkupAzA6STm0no=", "path": "github.com/aws/aws-sdk-go/aws/credentials/stscreds", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "eI5TmiOTCFjEUNvWeceFycs9dRU=", "path": "github.com/aws/aws-sdk-go/aws/csm", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "6DRhqSAN7O45gYfRIpwDeuJE8j8=", "path": "github.com/aws/aws-sdk-go/aws/defaults", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "uPkjJo+J10vbEukYYXmf0w7Cn4Q=", "path": "github.com/aws/aws-sdk-go/aws/ec2metadata", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { - "checksumSHA1": "DOJDGiPJsP7PI7v95J6YMR/n048=", + "checksumSHA1": "dmNv2Zknjg9hMHc+Bu5/InkxdNI=", "path": "github.com/aws/aws-sdk-go/aws/endpoints", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "Ia/AZ2fZp7J4lMO6fpkvfLU/HGY=", "path": "github.com/aws/aws-sdk-go/aws/request", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "zx1mZCdOwgbjBV3jMfb0kyDd//Q=", "path": "github.com/aws/aws-sdk-go/aws/session", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "gQ1sGIVnPqvvxa9Ww2g/PGkk16M=", "path": "github.com/aws/aws-sdk-go/aws/signer/v4", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "wjxQlU1PYxrDRFoL1Vek8Wch7jk=", "path": "github.com/aws/aws-sdk-go/internal/sdkio", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "MYLldFRnsZh21TfCkgkXCT3maPU=", "path": "github.com/aws/aws-sdk-go/internal/sdkrand", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "tQVg7Sz2zv+KkhbiXxPH0mh9spg=", "path": "github.com/aws/aws-sdk-go/internal/sdkuri", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "04ypv4x12l4q0TksA1zEVsmgpvw=", "path": "github.com/aws/aws-sdk-go/internal/shareddefaults", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "ZX5QHZb0PrK4UF45um2kaAEiX+8=", "path": "github.com/aws/aws-sdk-go/private/protocol", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "0cZnOaE1EcFUuiu4bdHV2k7slQg=", "path": "github.com/aws/aws-sdk-go/private/protocol/ec2query", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "stsUCJVnZ5yMrmzSExbjbYp5tZ8=", "path": "github.com/aws/aws-sdk-go/private/protocol/eventstream", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "bOQjEfKXaTqe7dZhDDER/wZUzQc=", "path": "github.com/aws/aws-sdk-go/private/protocol/eventstream/eventstreamapi", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "tXRIRarT7qepHconxydtO7mXod4=", "path": "github.com/aws/aws-sdk-go/private/protocol/json/jsonutil", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "M/NMrlQ2oULxgqzCvOfA30NN+Hc=", "path": "github.com/aws/aws-sdk-go/private/protocol/jsonrpc", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "lj56XJFI2OSp+hEOrFZ+eiEi/yM=", "path": "github.com/aws/aws-sdk-go/private/protocol/query", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "+O6A945eTP9plLpkEMZB0lwBAcg=", "path": "github.com/aws/aws-sdk-go/private/protocol/query/queryutil", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "uRvmEPKcEdv7qc0Ep2zn0E3Xumc=", "path": "github.com/aws/aws-sdk-go/private/protocol/rest", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "OGjEnXhjob/5yfMcW8JHD9NeczY=", "path": "github.com/aws/aws-sdk-go/private/protocol/restjson", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "ZZgzuZoMphxAf8wwz9QqpSQdBGc=", "path": "github.com/aws/aws-sdk-go/private/protocol/restxml", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "soXVJWQ/xvEB72Mo6FresaQIxLg=", "path": "github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "F6mth+G7dXN1GI+nktaGo8Lx8aE=", "path": "github.com/aws/aws-sdk-go/private/signer/v2", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "4xFqSOZkwDKot6FJQQgKjhJFoQw=", "path": "github.com/aws/aws-sdk-go/service/acm", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "3e/4A/8NqTOSXEtJ6KhYAqqWnuY=", "path": "github.com/aws/aws-sdk-go/service/acmpca", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "gnra20TFPzmLbXjGvNyd1I8MP+A=", "path": "github.com/aws/aws-sdk-go/service/apigateway", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "K/ynSj/L2OzW+9Zqs2PRe8NzYUc=", "path": "github.com/aws/aws-sdk-go/service/applicationautoscaling", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "owhfVKeKxjXt4P5KO6PSIjnMLIA=", "path": "github.com/aws/aws-sdk-go/service/appsync", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "3JN52M5wxJMazxQWXB4epL78LNQ=", "path": "github.com/aws/aws-sdk-go/service/athena", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "P2+Mby00TG2KXcfhiVoNoqIT1Kc=", "path": "github.com/aws/aws-sdk-go/service/autoscaling", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "42OCpXRErVgOtgPsuTrdg7y++TA=", "path": "github.com/aws/aws-sdk-go/service/batch", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "kPYTVg109H4HL8CKEf1yQvwKMw4=", "path": "github.com/aws/aws-sdk-go/service/budgets", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "GhANcrglYWrhNSR/NzxNe3jClMk=", "path": "github.com/aws/aws-sdk-go/service/cloud9", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "HmZRIixQ6u+zMz2Qt0iTU42WVZU=", "path": "github.com/aws/aws-sdk-go/service/cloudformation", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "vji1m2m9ubDFRcv7UuDcD/CBjTc=", "path": "github.com/aws/aws-sdk-go/service/cloudfront", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { - "checksumSHA1": "iFvc4+KfDeQHigAz2+TmogG1Y7M=", + "checksumSHA1": "H5MA8wWENhj36kHuNzegai4auhg=", "path": "github.com/aws/aws-sdk-go/service/cloudhsmv2", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "1uyTJ/RTr7c8uL2Kbrp+60PE40M=", "path": "github.com/aws/aws-sdk-go/service/cloudsearch", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "XTJxEnVVUOosPxVNHYHpkJ7Cexo=", "path": "github.com/aws/aws-sdk-go/service/cloudtrail", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "o+DFxugR5Cy/Wwlv7GSRRilTW4o=", "path": "github.com/aws/aws-sdk-go/service/cloudwatch", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "bbsROEsQ5BI5F2k8qiArbrpgH94=", "path": "github.com/aws/aws-sdk-go/service/cloudwatchevents", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "UyVuwts5ZE8rw9jGeubOLvvQaI8=", "path": "github.com/aws/aws-sdk-go/service/cloudwatchlogs", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "D3p9zRPfvqPBDBVGCCVG2wgYh38=", "path": "github.com/aws/aws-sdk-go/service/codebuild", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "rvZxiKvno7mVcW7tS+rcF6mDWsY=", "path": "github.com/aws/aws-sdk-go/service/codecommit", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "GvjVVg5btXuEFEHqyoe19BZogGw=", "path": "github.com/aws/aws-sdk-go/service/codedeploy", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "vklitYIK0AiOXA0obSTq0c04pc4=", "path": "github.com/aws/aws-sdk-go/service/codepipeline", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "rL0O6L1zSJ/UQE0kEWUoCOOFDog=", "path": "github.com/aws/aws-sdk-go/service/cognitoidentity", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "gkmRw2ZP/uU+V3b9v7CQM0CA0xs=", "path": "github.com/aws/aws-sdk-go/service/cognitoidentityprovider", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "ZKsjHOyH5z0PuKFcNtwlbhxwHFg=", "path": "github.com/aws/aws-sdk-go/service/configservice", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "RmFFvwnIx0l3buDtcoQ3PWkW7+g=", "path": "github.com/aws/aws-sdk-go/service/databasemigrationservice", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "TWva9VAs3zgU/FQjJkiUvY3wIXw=", "path": "github.com/aws/aws-sdk-go/service/dax", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "LfJ0Owy9HyaulKTvDEgCdkChMG8=", "path": "github.com/aws/aws-sdk-go/service/devicefarm", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "zblSxBuyR1S5z7oSouEdCXoCUuE=", "path": "github.com/aws/aws-sdk-go/service/directconnect", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "a02+OXxnVBBBeaZpgs8dXUHj8b0=", "path": "github.com/aws/aws-sdk-go/service/directoryservice", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "xoFqND2spsYdyoui+wKepfGQS8c=", "path": "github.com/aws/aws-sdk-go/service/dlm", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "42xYT0wxX/R9vu4C9+cHtBZkvxY=", "path": "github.com/aws/aws-sdk-go/service/dynamodb", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "QutiSGcdlnEisOq+KNZ872PAl7I=", "path": "github.com/aws/aws-sdk-go/service/ec2", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "VD7bAh0n/UgOwRBPe5y38Ow/dHU=", "path": "github.com/aws/aws-sdk-go/service/ecr", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "Q8RuvleYpFO1hlm/eKRbg5wG/nQ=", "path": "github.com/aws/aws-sdk-go/service/ecs", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "NDrEwIZeUSlHgENwBzVdy0KcCCY=", "path": "github.com/aws/aws-sdk-go/service/efs", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "dSndJIyIFwpciskUn2ZmUvIdR+c=", "path": "github.com/aws/aws-sdk-go/service/eks", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "kvsll2DfqS1hg97xSWMIcMan5as=", "path": "github.com/aws/aws-sdk-go/service/elasticache", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "G1BmSThB0eTjq8gSfjA+PnB9zs0=", "path": "github.com/aws/aws-sdk-go/service/elasticbeanstalk", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "O++z0DZj/MzSNWgVfV+SYzTS/fM=", "path": "github.com/aws/aws-sdk-go/service/elasticsearchservice", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "qyRoP+xRrXcGnnUu78L8hv9Qar8=", "path": "github.com/aws/aws-sdk-go/service/elastictranscoder", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "SnJVGrH1gX3X7pfugBZ5dWhQM6E=", "path": "github.com/aws/aws-sdk-go/service/elb", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "wIiqI9GFAV2AQ32o2kEYHNyqVig=", "path": "github.com/aws/aws-sdk-go/service/elbv2", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "7cq3bZMJV152e3ocGW8mbI657J0=", "path": "github.com/aws/aws-sdk-go/service/emr", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "VO+EdD/iXQVzjiuIeCQhVAsm9SI=", "path": "github.com/aws/aws-sdk-go/service/firehose", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "tNVmAgvnURWLWibVCL7vIDYU7UM=", "path": "github.com/aws/aws-sdk-go/service/fms", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "J1SHh0J6kX8JBD0+TQCFP+1Kij4=", "path": "github.com/aws/aws-sdk-go/service/gamelift", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "BB3/VzUU5Rg4KgrezJ17D4kCnwA=", "path": "github.com/aws/aws-sdk-go/service/glacier", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "A1E5569KvbsmoB9/eA0YxBYmjMI=", "path": "github.com/aws/aws-sdk-go/service/glue", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "HNndTio5+fNOiLr23i+QZpPp8HU=", "path": "github.com/aws/aws-sdk-go/service/guardduty", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "ae+jhUirSvN0IXPVU7X7xc+EbFE=", "path": "github.com/aws/aws-sdk-go/service/iam", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "39yMWxFP9XB+8wWWCZX4vkNWmxU=", "path": "github.com/aws/aws-sdk-go/service/inspector", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "wAWGvZ95XguL4gT8AEYNtum2eZM=", "path": "github.com/aws/aws-sdk-go/service/iot", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "q9HZ/0/lBSRKtjHXMegmcRcazPo=", "path": "github.com/aws/aws-sdk-go/service/kinesis", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "nUdxsOW9jg+m+sWZYPu7oX9rZo8=", "path": "github.com/aws/aws-sdk-go/service/kinesisanalytics", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "vaMnUnRVDkpHp/e4f3dFX20JblM=", "path": "github.com/aws/aws-sdk-go/service/kms", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "5dqI6y+bI5brPj7ReZT/NJSGzrM=", "path": "github.com/aws/aws-sdk-go/service/lambda", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "nMklVJilxMmhlmnnquFJB97isMk=", "path": "github.com/aws/aws-sdk-go/service/lexmodelbuildingservice", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "ROCCysE4/I6Tu5OCs6fuc0uTXBo=", "path": "github.com/aws/aws-sdk-go/service/lightsail", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "+l6bA5aVzmBXH2Isj1xZkd5RKNY=", "path": "github.com/aws/aws-sdk-go/service/macie", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "yLEEM14iEZqEH3C7ieCw+puIjiU=", "path": "github.com/aws/aws-sdk-go/service/mediaconvert", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "PE3129yEUwSvn0rg3P86Pxqnnps=", "path": "github.com/aws/aws-sdk-go/service/medialive", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "7/SSsXiRqnukDTUDeEg1ToMD6nQ=", "path": "github.com/aws/aws-sdk-go/service/mediapackage", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "9NU6dJOvKvcgnl/4eUdwy4YD5ss=", "path": "github.com/aws/aws-sdk-go/service/mediastore", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "qyIVtaN5mzPq4d7BDj9YpYtifKs=", "path": "github.com/aws/aws-sdk-go/service/mediastoredata", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "1jKxCBvS+zKzq6p2i4BqLXYHm48=", "path": "github.com/aws/aws-sdk-go/service/mq", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "44C523Sshu3BkoWwmXxawrUF2LQ=", "path": "github.com/aws/aws-sdk-go/service/neptune", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "x3PsW91a7fh+Q466y3WM3fdtnGg=", "path": "github.com/aws/aws-sdk-go/service/opsworks", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "YCd2EU1DPiO0QTRZk6G1fLZAyg0=", "path": "github.com/aws/aws-sdk-go/service/organizations", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "e5v4Cc9/0H2ngQNuvVyj2Mt0vi0=", "path": "github.com/aws/aws-sdk-go/service/pinpoint", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "j1i1tZ94/kDvvzgpv5xqxwNvgyY=", "path": "github.com/aws/aws-sdk-go/service/pricing", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "vQ0oeZ+9gR8zIbkYMEA87D/vAas=", "path": "github.com/aws/aws-sdk-go/service/rds", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { - "checksumSHA1": "1zThqt8de3tv6wOzT/8mKxqJ5kE=", + "checksumSHA1": "QocMd7m30oMSTWvEWoqytggtMno=", "path": "github.com/aws/aws-sdk-go/service/redshift", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "KlM6azZ5G09MmPg+lzEizW2qaLA=", "path": "github.com/aws/aws-sdk-go/service/route53", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "u5BxHJjA59ZgfZYvR5aJgWAthM8=", "path": "github.com/aws/aws-sdk-go/service/s3", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "qB34t8+gQAYbx7kaxDIllgM9MpQ=", "path": "github.com/aws/aws-sdk-go/service/sagemaker", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "FkBALtXiN4PCzFnl/G2gXFFLV3E=", "path": "github.com/aws/aws-sdk-go/service/secretsmanager", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "Y29bmjwKXcPg0d0WvZNFGdhd4+E=", "path": "github.com/aws/aws-sdk-go/service/serverlessapplicationrepository", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "T8dOJ1jjEBdogUE03oRPRJCOY3k=", "path": "github.com/aws/aws-sdk-go/service/servicecatalog", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "UhJ0RdPXzdMOUEBWREB5Zi9lgmY=", "path": "github.com/aws/aws-sdk-go/service/servicediscovery", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "0vtFXRYnhlCCq8/zPv1O1YWIoSg=", "path": "github.com/aws/aws-sdk-go/service/ses", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "1rJbvLXRsCzWhTihruRq/i0Zawg=", "path": "github.com/aws/aws-sdk-go/service/sfn", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "hliWYTmov/HswyMpYq93zJtdkk0=", "path": "github.com/aws/aws-sdk-go/service/simpledb", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "bW9FW0Qe3VURaSoY305kA/wCFrM=", "path": "github.com/aws/aws-sdk-go/service/sns", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "ECIZck5xhocpUl8GeUAdeSnCgvg=", "path": "github.com/aws/aws-sdk-go/service/sqs", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { - "checksumSHA1": "307CISQxMTTnatZ//6/p8obzeGs=", + "checksumSHA1": "WmzUmkGbfT3M2Cck71AbSn4DlX8=", "path": "github.com/aws/aws-sdk-go/service/ssm", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "TeuakooizAybzyMQyTXllUyhfBg=", "path": "github.com/aws/aws-sdk-go/service/storagegateway", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "UhIVLDgQc19wjrPj8pP7Fu2UwWc=", "path": "github.com/aws/aws-sdk-go/service/sts", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "zSqEhiGtEK6ll3f1Rlf2tuDKQA8=", "path": "github.com/aws/aws-sdk-go/service/swf", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "N/w20GqQBU7sVFbshxOA3AWAvDU=", "path": "github.com/aws/aws-sdk-go/service/waf", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "ocF/2t8BOrkUpc62h6kHH0WtfTg=", "path": "github.com/aws/aws-sdk-go/service/wafregional", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "oe8l2ibuhzz7fWM3f64cWnHwFy8=", "path": "github.com/aws/aws-sdk-go/service/workspaces", - "revision": "56018901efd0b8084af1fb83b7e2604aba53f143", - "revisionTime": "2018-09-07T21:05:52Z", - "version": "v1.15.31", - "versionExact": "v1.15.31" + "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", + "revisionTime": "2018-09-11T19:37:41Z", + "version": "v1.15.33", + "versionExact": "v1.15.33" }, { "checksumSHA1": "yBBHqv7DvZNsZdF00SO8PbEQAKU=", From 4dcbe897f08141d732a03127faf085f3a25896c3 Mon Sep 17 00:00:00 2001 From: Mark Butcher Date: Wed, 12 Sep 2018 23:57:51 +1000 Subject: [PATCH 108/184] Issue #4633 retry lambda creation Treat the error 'Lambda was unable to configure access to your environment variables because the KMS key is invalid for CreateGrant' as retryable. The root cause seems to be (?) that the required role hasn't fully been created when the lamdba creation is attmpted (but hard to know). The failure is intermittent and does not occur on retry. --- aws/resource_aws_lambda_function.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/aws/resource_aws_lambda_function.go b/aws/resource_aws_lambda_function.go index 88377ab1547..625fd1f9b6d 100644 --- a/aws/resource_aws_lambda_function.go +++ b/aws/resource_aws_lambda_function.go @@ -382,6 +382,10 @@ func resourceAwsLambdaFunctionCreate(d *schema.ResourceData, meta interface{}) e log.Printf("[DEBUG] Received %s, retrying CreateFunction", err) return resource.RetryableError(err) } + if isAWSErr(err, "InvalidParameterValueException", "Lambda was unable to configure access to your environment variables because the KMS key is invalid for CreateGrant") { + log.Printf("[DEBUG] Received %s, retrying CreateFunction", err) + return resource.RetryableError(err) + } return resource.NonRetryableError(err) } From 4515d55eadb86938ddfe50e5118ed188cf022b19 Mon Sep 17 00:00:00 2001 From: Gareth Oakley Date: Wed, 12 Sep 2018 15:14:36 +0100 Subject: [PATCH 109/184] resource/aws_ssm_document: Add support for Session document_type --- aws/resource_aws_ssm_document.go | 1 + aws/resource_aws_ssm_document_test.go | 42 +++++++++++++++++++++++ website/docs/r/ssm_document.html.markdown | 2 +- 3 files changed, 44 insertions(+), 1 deletion(-) diff --git a/aws/resource_aws_ssm_document.go b/aws/resource_aws_ssm_document.go index a8fcab91637..070ddd5a551 100644 --- a/aws/resource_aws_ssm_document.go +++ b/aws/resource_aws_ssm_document.go @@ -58,6 +58,7 @@ func resourceAwsSsmDocument() *schema.Resource { ssm.DocumentTypeCommand, ssm.DocumentTypePolicy, ssm.DocumentTypeAutomation, + ssm.DocumentTypeSession, }, false), }, "schema_version": { diff --git a/aws/resource_aws_ssm_document_test.go b/aws/resource_aws_ssm_document_test.go index e67780fc110..2385eac10e7 100644 --- a/aws/resource_aws_ssm_document_test.go +++ b/aws/resource_aws_ssm_document_test.go @@ -197,6 +197,25 @@ func TestAccAWSSSMDocument_automation(t *testing.T) { }) } +func TestAccAWSSSMDocument_session(t *testing.T) { + name := acctest.RandString(10) + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSSSMDocumentDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSSSMDocumentTypeSessionConfig(name), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSSSMDocumentExists("aws_ssm_document.foo"), + resource.TestCheckResourceAttr( + "aws_ssm_document.foo", "document_type", "Session"), + ), + }, + }, + }) +} + func TestAccAWSSSMDocument_DocumentFormat_YAML(t *testing.T) { name := acctest.RandString(10) content1 := ` @@ -639,6 +658,29 @@ DOC `, rName, rName, rName) } +func testAccAWSSSMDocumentTypeSessionConfig(rName string) string { + return fmt.Sprintf(` +resource "aws_ssm_document" "foo" { + name = "test_document-%s" + document_type = "Session" + content = < Date: Wed, 12 Sep 2018 10:42:58 -0400 Subject: [PATCH 110/184] back out of the ipv6 changes --- aws/resource_aws_launch_template.go | 17 +++++++++-------- aws/resource_aws_launch_template_test.go | 2 -- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/aws/resource_aws_launch_template.go b/aws/resource_aws_launch_template.go index 498b4545af6..5be358d0b58 100644 --- a/aws/resource_aws_launch_template.go +++ b/aws/resource_aws_launch_template.go @@ -319,7 +319,7 @@ func resourceAwsLaunchTemplate() *schema.Resource { }, "ipv6_address_count": { Type: schema.TypeInt, - Optional: true, + Computed: true, }, "ipv6_addresses": { Type: schema.TypeSet, @@ -1095,15 +1095,16 @@ func readNetworkInterfacesFromConfig(ni map[string]interface{}) *ec2.LaunchTempl } } + ipv6AddressList := ni["ipv6_addresses"].(*schema.Set).List() + for _, address := range ipv6AddressList { + ipv6Addresses = append(ipv6Addresses, &ec2.InstanceIpv6AddressRequest{ + Ipv6Address: aws.String(address.(string)), + }) + } + networkInterface.Ipv6Addresses = ipv6Addresses + if v := ni["ipv6_address_count"].(int); v > 0 { networkInterface.Ipv6AddressCount = aws.Int64(int64(v)) - } else if v := ni["ipv6_addresses"].(*schema.Set); v.Len() > 0 { - for _, address := range v.List() { - ipv6Addresses = append(ipv6Addresses, &ec2.InstanceIpv6AddressRequest{ - Ipv6Address: aws.String(address.(string)), - }) - } - networkInterface.Ipv6Addresses = ipv6Addresses } if v := ni["ipv4_address_count"].(int); v > 0 { diff --git a/aws/resource_aws_launch_template_test.go b/aws/resource_aws_launch_template_test.go index ec4939eaadf..e53c527d20b 100644 --- a/aws/resource_aws_launch_template_test.go +++ b/aws/resource_aws_launch_template_test.go @@ -244,7 +244,6 @@ func TestAccAWSLaunchTemplate_networkInterface(t *testing.T) { resource.TestCheckResourceAttrSet(resName, "network_interfaces.0.network_interface_id"), resource.TestCheckResourceAttr(resName, "network_interfaces.0.associate_public_ip_address", "false"), resource.TestCheckResourceAttr(resName, "network_interfaces.0.ipv4_address_count", "2"), - resource.TestCheckResourceAttr(resName, "network_interfaces.0.ipv6_address_count", "3"), ), }, }, @@ -528,7 +527,6 @@ resource "aws_launch_template" "test" { network_interfaces { network_interface_id = "${aws_network_interface.test.id}" ipv4_address_count = 2 - ipv6_address_count = 3 } } ` From 09dfed01c89435ae3e14dad2e3d76ded9482ec41 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 12 Sep 2018 11:33:21 -0400 Subject: [PATCH 111/184] resource/aws_config_config_rule: Prevent panic when specifying empty scope Previously: ``` === RUN TestAccAWSConfig/Config/scopeTagKeyEmpty panic: interface conversion: interface {} is nil, not map[string]interface {} goroutine 1709 [running]: github.com/terraform-providers/terraform-provider-aws/aws.resourceAwsConfigConfigRulePut(0xc0002e8fc0, 0x3c46240, 0xc0000b2600, 0x24, 0x71ead40) /Users/bflad/go/src/github.com/terraform-providers/terraform-provider-aws/aws/resource_aws_config_config_rule.go:154 +0x7e6 ``` Now: ``` --- PASS: TestAccAWSConfig/Config/scopeTagKeyEmpty (101.17s) ``` --- aws/resource_aws_config_config_rule.go | 6 +- aws/resource_aws_config_config_rule_test.go | 155 ++++++++++++++++++++ aws/resource_aws_config_test.go | 13 +- aws/structure.go | 6 +- 4 files changed, 169 insertions(+), 11 deletions(-) diff --git a/aws/resource_aws_config_config_rule.go b/aws/resource_aws_config_config_rule.go index 9f055b5b6d6..08621f114b4 100644 --- a/aws/resource_aws_config_config_rule.go +++ b/aws/resource_aws_config_config_rule.go @@ -146,14 +146,10 @@ func resourceAwsConfigConfigRulePut(d *schema.ResourceData, meta interface{}) er name := d.Get("name").(string) ruleInput := configservice.ConfigRule{ ConfigRuleName: aws.String(name), + Scope: expandConfigRuleScope(d.Get("scope").([]interface{})), Source: expandConfigRuleSource(d.Get("source").([]interface{})), } - scopes := d.Get("scope").([]interface{}) - if len(scopes) > 0 { - ruleInput.Scope = expandConfigRuleScope(scopes[0].(map[string]interface{})) - } - if v, ok := d.GetOk("description"); ok { ruleInput.Description = aws.String(v.(string)) } diff --git a/aws/resource_aws_config_config_rule_test.go b/aws/resource_aws_config_config_rule_test.go index d8db29ba197..52e0802c195 100644 --- a/aws/resource_aws_config_config_rule_test.go +++ b/aws/resource_aws_config_config_rule_test.go @@ -159,6 +159,86 @@ func testAccConfigConfigRule_importLambda(t *testing.T) { }) } +func testAccConfigConfigRule_Scope_TagKey(t *testing.T) { + var configRule configservice.ConfigRule + rName := acctest.RandomWithPrefix("tf-acc-test") + resourceName := "aws_config_config_rule.test" + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckConfigConfigRuleDestroy, + Steps: []resource.TestStep{ + { + Config: testAccConfigConfigRuleConfig_Scope_TagKey(rName, "key1"), + Check: resource.ComposeTestCheckFunc( + testAccCheckConfigConfigRuleExists(resourceName, &configRule), + resource.TestCheckResourceAttr(resourceName, "scope.#", "1"), + resource.TestCheckResourceAttr(resourceName, "scope.0.tag_key", "key1"), + ), + }, + { + Config: testAccConfigConfigRuleConfig_Scope_TagKey(rName, "key2"), + Check: resource.ComposeTestCheckFunc( + testAccCheckConfigConfigRuleExists(resourceName, &configRule), + resource.TestCheckResourceAttr(resourceName, "scope.#", "1"), + resource.TestCheckResourceAttr(resourceName, "scope.0.tag_key", "key2"), + ), + }, + }, + }) +} + +func testAccConfigConfigRule_Scope_TagKey_Empty(t *testing.T) { + var configRule configservice.ConfigRule + rName := acctest.RandomWithPrefix("tf-acc-test") + resourceName := "aws_config_config_rule.test" + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckConfigConfigRuleDestroy, + Steps: []resource.TestStep{ + { + Config: testAccConfigConfigRuleConfig_Scope_TagKey(rName, ""), + Check: resource.ComposeTestCheckFunc( + testAccCheckConfigConfigRuleExists(resourceName, &configRule), + ), + }, + }, + }) +} + +func testAccConfigConfigRule_Scope_TagValue(t *testing.T) { + var configRule configservice.ConfigRule + rName := acctest.RandomWithPrefix("tf-acc-test") + resourceName := "aws_config_config_rule.test" + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckConfigConfigRuleDestroy, + Steps: []resource.TestStep{ + { + Config: testAccConfigConfigRuleConfig_Scope_TagValue(rName, "value1"), + Check: resource.ComposeTestCheckFunc( + testAccCheckConfigConfigRuleExists(resourceName, &configRule), + resource.TestCheckResourceAttr(resourceName, "scope.#", "1"), + resource.TestCheckResourceAttr(resourceName, "scope.0.tag_value", "value1"), + ), + }, + { + Config: testAccConfigConfigRuleConfig_Scope_TagValue(rName, "value2"), + Check: resource.ComposeTestCheckFunc( + testAccCheckConfigConfigRuleExists(resourceName, &configRule), + resource.TestCheckResourceAttr(resourceName, "scope.#", "1"), + resource.TestCheckResourceAttr(resourceName, "scope.0.tag_value", "value2"), + ), + }, + }, + }) +} + func testAccCheckConfigConfigRuleName(n, desired string, obj *configservice.ConfigRule) resource.TestCheckFunc { return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[n] @@ -224,6 +304,42 @@ func testAccCheckConfigConfigRuleDestroy(s *terraform.State) error { return nil } +func testAccConfigConfigRuleConfig_base(rName string) string { + return fmt.Sprintf(` +data "aws_partition" "current" {} + +resource "aws_config_configuration_recorder" "test" { + name = %q + role_arn = "${aws_iam_role.test.arn}" +} + +resource "aws_iam_role" "test" { + name = %q + + assume_role_policy = < Date: Wed, 12 Sep 2018 12:21:27 -0400 Subject: [PATCH 112/184] Update CHANGELOG for #5850 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 31cb2a8a528..0e16e9cb59f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ ENHANCEMENTS: * data-source/aws_db_instance: Add `enabled_cloudwatch_logs_exports` attribute [GH-5801] * resource/aws_db_instance: Add `domain` and `domain_iam_role_name` arguments (support for domain joining RDS instances) [GH-5378] * resource/aws_ecs_task_definition: Suppress `container_definition` differences for equivalent port and host mappings [GH-5833] +* resource/aws_ssm_document: Add support for `Session` `document_type` [GH-5850] BUG FIXES: From 04c1ce13a3ad40d3c6e14ff2e6d539819cfa2629 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 12 Sep 2018 12:40:07 -0400 Subject: [PATCH 113/184] Update CHANGELOG for #5830 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0e16e9cb59f..fcb35b31680 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ ENHANCEMENTS: * data-source/aws_db_instance: Add `enabled_cloudwatch_logs_exports` attribute [GH-5801] * resource/aws_db_instance: Add `domain` and `domain_iam_role_name` arguments (support for domain joining RDS instances) [GH-5378] * resource/aws_ecs_task_definition: Suppress `container_definition` differences for equivalent port and host mappings [GH-5833] +* resource/aws_launch_template: Allow `network_interface` `ipv4_address_count` configuration [GH-5830] * resource/aws_ssm_document: Add support for `Session` `document_type` [GH-5850] BUG FIXES: From 240450b0af4c0f5cc0e39cf2be60b046a27b9e9d Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 12 Sep 2018 12:54:43 -0400 Subject: [PATCH 114/184] resource/aws_lambda_function: Apply KMS environment variable retries to UpdateFunctionConfiguration as well Followup commit for: https://github.com/terraform-providers/terraform-provider-aws/pull/5849 --- aws/resource_aws_lambda_function.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/aws/resource_aws_lambda_function.go b/aws/resource_aws_lambda_function.go index 625fd1f9b6d..fb4706374cd 100644 --- a/aws/resource_aws_lambda_function.go +++ b/aws/resource_aws_lambda_function.go @@ -745,6 +745,11 @@ func resourceAwsLambdaFunctionUpdate(d *schema.ResourceData, meta interface{}) e log.Printf("[DEBUG] Received %s, retrying UpdateFunctionConfiguration", err) return resource.RetryableError(err) } + if isAWSErr(err, "InvalidParameterValueException", "Lambda was unable to configure access to your environment variables because the KMS key is invalid for CreateGrant") { + log.Printf("[DEBUG] Received %s, retrying CreateFunction", err) + return resource.RetryableError(err) + } + return resource.NonRetryableError(err) } return nil From 07211e2f55554721c899dbcdeb5eb4480dff3fdb Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 12 Sep 2018 12:57:41 -0400 Subject: [PATCH 115/184] Update CHANGELOG for #5849 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index fcb35b31680..2283a5eccd8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ ENHANCEMENTS: BUG FIXES: +* resource/aws_lambda_function: Retry on `InvalidParameterValueException` errors relating to KMS-backed environment variables [GH-5849] * resource/aws_launch_template: Ensure `ebs_optimized` argument accepts "unspecified" value [GH-5627] ## 1.35.0 (September 06, 2018) From f1d9ad7b9ae81431a50b38293fec4bba08ead04c Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 12 Sep 2018 13:17:31 -0400 Subject: [PATCH 116/184] Update CHANGELOG for #5727 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2283a5eccd8..5e22fe29966 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ ENHANCEMENTS: * data-source/aws_db_instance: Add `enabled_cloudwatch_logs_exports` attribute [GH-5801] * resource/aws_db_instance: Add `domain` and `domain_iam_role_name` arguments (support for domain joining RDS instances) [GH-5378] * resource/aws_ecs_task_definition: Suppress `container_definition` differences for equivalent port and host mappings [GH-5833] +* resource/aws_ecs_task_definition: Add docker volume configuration [GH-5727] * resource/aws_launch_template: Allow `network_interface` `ipv4_address_count` configuration [GH-5830] * resource/aws_ssm_document: Add support for `Session` `document_type` [GH-5850] From deb1ef2a15eebe4f645d3f67d2aeeecc0f028267 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 12 Sep 2018 14:20:05 -0400 Subject: [PATCH 117/184] Update CHANGELOG for #5681 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5e22fe29966..408110dbdc3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ENHANCEMENTS: * data-source/aws_db_instance: Add `enabled_cloudwatch_logs_exports` attribute [GH-5801] +* resource/aws_cloudfront_distribution: Add `lambda_function_association` `include_body` argument [GH-5681] * resource/aws_db_instance: Add `domain` and `domain_iam_role_name` arguments (support for domain joining RDS instances) [GH-5378] * resource/aws_ecs_task_definition: Suppress `container_definition` differences for equivalent port and host mappings [GH-5833] * resource/aws_ecs_task_definition: Add docker volume configuration [GH-5727] From 8f807218a36cc820b4a3cdc5067aba30f96e705c Mon Sep 17 00:00:00 2001 From: saravanan30erd Date: Wed, 12 Sep 2018 22:51:55 +0400 Subject: [PATCH 118/184] corrections based on PR #5737 feedback --- aws/resource_aws_cloudfront_public_key.go | 21 +++++++------------ ...resource_aws_cloudfront_public_key_test.go | 8 +++++-- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/aws/resource_aws_cloudfront_public_key.go b/aws/resource_aws_cloudfront_public_key.go index 7a6e819909f..c0e20bcb7f5 100644 --- a/aws/resource_aws_cloudfront_public_key.go +++ b/aws/resource_aws_cloudfront_public_key.go @@ -98,20 +98,17 @@ func resourceAwsCloudFrontPublicKeyRead(d *schema.ResourceData, meta interface{} return err } - var publicKeyConfig *cloudfront.PublicKeyConfig - publicKeyConfig = output.PublicKey.PublicKeyConfig + if output == nil || output.PublicKey == nil || output.PublicKey.PublicKeyConfig == nil { + log.Printf("[WARN] No PublicKey found: %s, removing from state", d.Id()) + d.SetId("") + return nil + } + publicKeyConfig := output.PublicKey.PublicKeyConfig d.Set("encoded_key", publicKeyConfig.EncodedKey) d.Set("name", publicKeyConfig.Name) - - if publicKeyConfig.Comment != nil { - d.Set("comment", publicKeyConfig.Comment) - } - - if publicKeyConfig.CallerReference != nil { - d.Set("caller_reference", publicKeyConfig.CallerReference) - } - + d.Set("comment", publicKeyConfig.Comment) + d.Set("caller_reference", publicKeyConfig.CallerReference) d.Set("etag", output.ETag) return nil @@ -145,8 +142,6 @@ func resourceAwsCloudFrontPublicKeyDelete(d *schema.ResourceData, meta interface _, err := conn.DeletePublicKey(request) if err != nil { if isAWSErr(err, cloudfront.ErrCodeNoSuchPublicKey, "") { - log.Printf("[WARN] No PublicKey found: %s, removing from state", d.Id()) - d.SetId("") return nil } return err diff --git a/aws/resource_aws_cloudfront_public_key_test.go b/aws/resource_aws_cloudfront_public_key_test.go index f3bf1787d29..cf3c38fde84 100644 --- a/aws/resource_aws_cloudfront_public_key_test.go +++ b/aws/resource_aws_cloudfront_public_key_test.go @@ -117,9 +117,13 @@ func testAccCheckCloudFrontPublicKeyDestroy(s *terraform.State) error { } _, err := conn.GetPublicKey(params) - if err == nil { - return fmt.Errorf("CloudFront PublicKey was not deleted") + if isAWSErr(err, cloudfront.ErrCodeNoSuchPublicKey, "") { + continue + } + if err != nil { + return err } + return fmt.Errorf("CloudFront PublicKey (%s) was not deleted", rs.Primary.ID) } return nil From 8234609004737b9ccfd6ae8d8927666decca1c92 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 12 Sep 2018 14:56:10 -0400 Subject: [PATCH 119/184] resource/aws_iot_topic_rule: Address PR #5734 feedback * Prevent panic with omitted firehose separator in API response * Escape whitespace characters in firehose separator ValidateFunc error message * Add separate test for firehose separator ``` $ make testacc TEST=./aws TESTARGS='-run=TestAccAWSIoTTopicRule_' ==> Checking that code complies with gofmt requirements... TF_ACC=1 go test ./aws -v -run=TestAccAWSIoTTopicRule_ -timeout 120m === RUN TestAccAWSIoTTopicRule_importbasic --- PASS: TestAccAWSIoTTopicRule_importbasic (10.57s) === RUN TestAccAWSIoTTopicRule_basic --- PASS: TestAccAWSIoTTopicRule_basic (8.47s) === RUN TestAccAWSIoTTopicRule_cloudwatchalarm --- PASS: TestAccAWSIoTTopicRule_cloudwatchalarm (9.02s) === RUN TestAccAWSIoTTopicRule_cloudwatchmetric --- PASS: TestAccAWSIoTTopicRule_cloudwatchmetric (9.31s) === RUN TestAccAWSIoTTopicRule_elasticsearch --- PASS: TestAccAWSIoTTopicRule_elasticsearch (9.43s) === RUN TestAccAWSIoTTopicRule_firehose --- PASS: TestAccAWSIoTTopicRule_firehose (9.35s) === RUN TestAccAWSIoTTopicRule_firehose_separator --- PASS: TestAccAWSIoTTopicRule_firehose_separator (14.01s) === RUN TestAccAWSIoTTopicRule_kinesis --- PASS: TestAccAWSIoTTopicRule_kinesis (9.69s) === RUN TestAccAWSIoTTopicRule_lambda --- PASS: TestAccAWSIoTTopicRule_lambda (8.47s) === RUN TestAccAWSIoTTopicRule_republish --- PASS: TestAccAWSIoTTopicRule_republish (8.10s) === RUN TestAccAWSIoTTopicRule_s3 --- PASS: TestAccAWSIoTTopicRule_s3 (9.82s) === RUN TestAccAWSIoTTopicRule_sns --- PASS: TestAccAWSIoTTopicRule_sns (8.18s) === RUN TestAccAWSIoTTopicRule_sqs --- PASS: TestAccAWSIoTTopicRule_sqs (8.20s) PASS ok github.com/terraform-providers/terraform-provider-aws/aws 123.374s ``` --- aws/resource_aws_iot_topic_rule_test.go | 43 ++++++++++++++++++++++++- aws/structure.go | 6 ++-- aws/validators.go | 2 +- 3 files changed, 46 insertions(+), 5 deletions(-) diff --git a/aws/resource_aws_iot_topic_rule_test.go b/aws/resource_aws_iot_topic_rule_test.go index 5141f5a678a..4f3d0492dba 100644 --- a/aws/resource_aws_iot_topic_rule_test.go +++ b/aws/resource_aws_iot_topic_rule_test.go @@ -105,6 +105,30 @@ func TestAccAWSIoTTopicRule_firehose(t *testing.T) { }) } +func TestAccAWSIoTTopicRule_firehose_separator(t *testing.T) { + rName := acctest.RandString(5) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSIoTTopicRuleDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSIoTTopicRule_firehose_separator(rName, "\n"), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSIoTTopicRuleExists_basic("aws_iot_topic_rule.rule"), + ), + }, + { + Config: testAccAWSIoTTopicRule_firehose_separator(rName, ","), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSIoTTopicRuleExists_basic("aws_iot_topic_rule.rule"), + ), + }, + }, + }) +} + func TestAccAWSIoTTopicRule_kinesis(t *testing.T) { rName := acctest.RandString(5) @@ -387,12 +411,29 @@ resource "aws_iot_topic_rule" "rule" { firehose { delivery_stream_name = "mystream" role_arn = "${aws_iam_role.iot_role.arn}" - separator = "\n" } } `, rName) } +func testAccAWSIoTTopicRule_firehose_separator(rName, separator string) string { + return fmt.Sprintf(testAccAWSIoTTopicRuleRole+` +resource "aws_iot_topic_rule" "rule" { + name = "test_rule_%[1]s" + description = "Example rule" + enabled = true + sql = "SELECT * FROM 'topic/test'" + sql_version = "2015-10-08" + + firehose { + delivery_stream_name = "mystream" + role_arn = "${aws_iam_role.iot_role.arn}" + separator = %q + } +} +`, rName, separator) +} + func testAccAWSIoTTopicRule_kinesis(rName string) string { return fmt.Sprintf(testAccAWSIoTTopicRuleRole+` resource "aws_iot_topic_rule" "rule" { diff --git a/aws/structure.go b/aws/structure.go index 0d8c4fb1f1a..ed347110959 100644 --- a/aws/structure.go +++ b/aws/structure.go @@ -2810,9 +2810,9 @@ func flattenIoTRuleFirehoseActions(actions []*iot.Action) []map[string]interface result := make(map[string]interface{}) v := a.Firehose if v != nil { - result["role_arn"] = *v.RoleArn - result["delivery_stream_name"] = *v.DeliveryStreamName - result["separator"] = *v.Separator + result["role_arn"] = aws.StringValue(v.RoleArn) + result["delivery_stream_name"] = aws.StringValue(v.DeliveryStreamName) + result["separator"] = aws.StringValue(v.Separator) results = append(results, result) } diff --git a/aws/validators.go b/aws/validators.go index ffe55a1287e..a622c74217c 100644 --- a/aws/validators.go +++ b/aws/validators.go @@ -1657,7 +1657,7 @@ func validateIoTTopicRuleFirehoseSeparator(v interface{}, s string) ([]string, [ return nil, nil } - return nil, []error{fmt.Errorf("Separator must be one of ',' (comma), '\t' (tab) '\n' (newline) or '\r\n' (Windows newline)")} + return nil, []error{fmt.Errorf("Separator must be one of ',' (comma), '\\t' (tab) '\\n' (newline) or '\\r\\n' (Windows newline)")} } func validateCognitoRoleMappingsAmbiguousRoleResolutionAgainstType(v map[string]interface{}) (errors []error) { From 13b35cbe0c7f9119daf785733847a4c8a31458d6 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 12 Sep 2018 15:00:10 -0400 Subject: [PATCH 120/184] Update CHANGELOG for #5734 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 408110dbdc3..ab74560f1d1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ ENHANCEMENTS: * resource/aws_db_instance: Add `domain` and `domain_iam_role_name` arguments (support for domain joining RDS instances) [GH-5378] * resource/aws_ecs_task_definition: Suppress `container_definition` differences for equivalent port and host mappings [GH-5833] * resource/aws_ecs_task_definition: Add docker volume configuration [GH-5727] +* resource/aws_iot_topic_rule: Add `firehose` `seperator` argument [GH-5734] * resource/aws_launch_template: Allow `network_interface` `ipv4_address_count` configuration [GH-5830] * resource/aws_ssm_document: Add support for `Session` `document_type` [GH-5850] From 79b93c5e13cdcc8fd315226a0bf5c2d72f434992 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 12 Sep 2018 15:09:05 -0400 Subject: [PATCH 121/184] Update CHANGELOG for #5737 --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ab74560f1d1..2a7da3d408d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ ## 1.36.0 (Unreleased) +FEATURES: + +* **New Resource:** `aws_cloudfront_public_key` [GH-5737] + ENHANCEMENTS: * data-source/aws_db_instance: Add `enabled_cloudwatch_logs_exports` attribute [GH-5801] From bc9348420f3f6a8592a71bfaa87ae234d791f049 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 12 Sep 2018 15:10:06 -0400 Subject: [PATCH 122/184] docs/resource/aws_cloudfront_public_key: Fix header copypasta --- website/docs/r/cloudfront_public_key.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/cloudfront_public_key.html.markdown b/website/docs/r/cloudfront_public_key.html.markdown index 11b4174be14..18fa64c6b6f 100644 --- a/website/docs/r/cloudfront_public_key.html.markdown +++ b/website/docs/r/cloudfront_public_key.html.markdown @@ -6,7 +6,7 @@ description: |- Provides a CloudFront Public Key which you add to CloudFront to use with features like field-level encryption. --- -# aws_cloudfront_distribution +# aws_cloudfront_public_key ## Example Usage From a837e891c789ae9834d1f1b0326cf3b089146907 Mon Sep 17 00:00:00 2001 From: saravanan30erd Date: Wed, 12 Sep 2018 23:59:49 +0400 Subject: [PATCH 123/184] corrections based on PR #5815 feedback --- aws/resource_aws_iam_policy.go | 8 +---- aws/resource_aws_iam_policy_test.go | 45 +---------------------------- 2 files changed, 2 insertions(+), 51 deletions(-) diff --git a/aws/resource_aws_iam_policy.go b/aws/resource_aws_iam_policy.go index aba97953b7e..33adf4f5c2e 100644 --- a/aws/resource_aws_iam_policy.go +++ b/aws/resource_aws_iam_policy.go @@ -28,7 +28,6 @@ func resourceAwsIamPolicy() *schema.Resource { Type: schema.TypeString, ForceNew: true, Optional: true, - Default: "Managed by Terraform", }, "path": { Type: schema.TypeString, @@ -279,12 +278,7 @@ func iamPolicyListVersions(arn string, iamconn *iam.IAM) ([]*iam.PolicyVersion, func readIamPolicy(d *schema.ResourceData, policy *iam.Policy) error { d.SetId(*policy.Arn) - if policy.Description != nil { - // the description isn't present in the response to CreatePolicy. - if err := d.Set("description", policy.Description); err != nil { - return err - } - } + d.Set("description", policy.Description) if err := d.Set("path", policy.Path); err != nil { return err } diff --git a/aws/resource_aws_iam_policy_test.go b/aws/resource_aws_iam_policy_test.go index 15b57f62451..e26a4b57db9 100644 --- a/aws/resource_aws_iam_policy_test.go +++ b/aws/resource_aws_iam_policy_test.go @@ -8,7 +8,6 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/iam" - "github.com/hashicorp/terraform/helper/acctest" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" ) @@ -27,6 +26,7 @@ func TestAWSPolicy_namePrefix(t *testing.T) { testAccCheckAWSPolicyExists("aws_iam_policy.policy", &out), testAccCheckAWSPolicyGeneratedNamePrefix( "aws_iam_policy.policy", "test-policy-"), + resource.TestCheckResourceAttr("aws_iam_policy.policy", "description", ""), ), }, }, @@ -47,26 +47,6 @@ func TestAWSPolicy_invalidJson(t *testing.T) { }) } -func TestAWSPolicy_checkDescription(t *testing.T) { - var out iam.GetPolicyOutput - rName := acctest.RandString(10) - - resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSPolicyDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAWSPolicyDescriptionCheckConfig(rName), - Check: resource.ComposeTestCheckFunc( - testAccCheckAWSPolicyExists("aws_iam_policy.policy", &out), - resource.TestCheckResourceAttrSet("aws_iam_policy.policy", "description"), - ), - }, - }, - }) -} - func testAccCheckAWSPolicyExists(resource string, res *iam.GetPolicyOutput) resource.TestCheckFunc { return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[resource] @@ -150,26 +130,3 @@ resource "aws_iam_policy" "policy" { EOF } ` - -func testAccAWSPolicyDescriptionCheckConfig(rName string) string { - return fmt.Sprintf(` - resource "aws_iam_policy" "policy" { - name_prefix = "test-policy-%s" - path = "/" - policy = < Date: Thu, 13 Sep 2018 00:42:39 +0400 Subject: [PATCH 124/184] Revert "update xray_tracing in api_gateway_deployment" This reverts commit 5f0a22f18edcaa72f3995c50bfab1ab04a5ef3d3. --- aws/resource_aws_api_gateway_deployment.go | 53 ++++--------------- ...esource_aws_api_gateway_deployment_test.go | 15 ++---- 2 files changed, 15 insertions(+), 53 deletions(-) diff --git a/aws/resource_aws_api_gateway_deployment.go b/aws/resource_aws_api_gateway_deployment.go index 9428f4cbaaf..f8fff84d464 100644 --- a/aws/resource_aws_api_gateway_deployment.go +++ b/aws/resource_aws_api_gateway_deployment.go @@ -65,12 +65,6 @@ func resourceAwsApiGatewayDeployment() *schema.Resource { Type: schema.TypeString, Computed: true, }, - - "xray_tracing_enabled": { - Type: schema.TypeBool, - Optional: true, - ForceNew: true, - }, }, } } @@ -80,29 +74,19 @@ func resourceAwsApiGatewayDeploymentCreate(d *schema.ResourceData, meta interfac // Create the gateway log.Printf("[DEBUG] Creating API Gateway Deployment") - input := &apigateway.CreateDeploymentInput{ - RestApiId: aws.String(d.Get("rest_api_id").(string)), - StageName: aws.String(d.Get("stage_name").(string)), + variables := make(map[string]string) + for k, v := range d.Get("variables").(map[string]interface{}) { + variables[k] = v.(string) } - if v, ok := d.GetOk("description"); ok { - input.Description = aws.String(v.(string)) - } - if v, ok := d.GetOk("stage_description"); ok { - input.StageDescription = aws.String(v.(string)) - } - if v, ok := d.GetOk("xray_tracing_enabled"); ok { - input.TracingEnabled = aws.Bool(v.(bool)) - } - if v, ok := d.GetOk("variables"); ok { - variables := make(map[string]string) - for k, v := range v.(map[string]interface{}) { - variables[k] = v.(string) - } - input.Variables = aws.StringMap(variables) - } - - deployment, err := conn.CreateDeployment(input) + var err error + deployment, err := conn.CreateDeployment(&apigateway.CreateDeploymentInput{ + RestApiId: aws.String(d.Get("rest_api_id").(string)), + StageName: aws.String(d.Get("stage_name").(string)), + Description: aws.String(d.Get("description").(string)), + StageDescription: aws.String(d.Get("stage_description").(string)), + Variables: aws.StringMap(variables), + }) if err != nil { return fmt.Errorf("Error creating API Gateway Deployment: %s", err) } @@ -151,21 +135,6 @@ func resourceAwsApiGatewayDeploymentRead(d *schema.ResourceData, meta interface{ log.Printf("[DEBUG] Error setting created_date: %s", err) } - input := &apigateway.GetStageInput{ - RestApiId: aws.String(d.Get("rest_api_id").(string)), - StageName: aws.String(d.Get("stage_name").(string)), - } - stage, err := conn.GetStage(input) - if err != nil { - return err - } - d.Set("xray_tracing_enabled", stage.TracingEnabled) - d.Set("stage_description", stage.Description) - d.Set("stage_name", stage.StageName) - if err := d.Set("variables", aws.StringValueMap(stage.Variables)); err != nil { - return fmt.Errorf("error setting stage variables: %s", err) - } - return nil } diff --git a/aws/resource_aws_api_gateway_deployment_test.go b/aws/resource_aws_api_gateway_deployment_test.go index d487beb1c97..7cf58a4e47e 100644 --- a/aws/resource_aws_api_gateway_deployment_test.go +++ b/aws/resource_aws_api_gateway_deployment_test.go @@ -7,14 +7,12 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/service/apigateway" - "github.com/hashicorp/terraform/helper/acctest" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" ) func TestAccAWSAPIGatewayDeployment_basic(t *testing.T) { var conf apigateway.Deployment - rName := acctest.RandString(8) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -22,7 +20,7 @@ func TestAccAWSAPIGatewayDeployment_basic(t *testing.T) { CheckDestroy: testAccCheckAWSAPIGatewayDeploymentDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSAPIGatewayDeploymentConfig(rName), + Config: testAccAWSAPIGatewayDeploymentConfig, Check: resource.ComposeTestCheckFunc( testAccCheckAWSAPIGatewayDeploymentExists("aws_api_gateway_deployment.test", &conf), resource.TestCheckResourceAttr( @@ -33,8 +31,6 @@ func TestAccAWSAPIGatewayDeployment_basic(t *testing.T) { "aws_api_gateway_deployment.test", "variables.a", "2"), resource.TestCheckResourceAttrSet( "aws_api_gateway_deployment.test", "created_date"), - resource.TestCheckResourceAttr( - "aws_api_gateway_deployment.test", "xray_tracing_enabled", "true"), ), }, }, @@ -107,10 +103,9 @@ func testAccCheckAWSAPIGatewayDeploymentDestroy(s *terraform.State) error { return nil } -func testAccAWSAPIGatewayDeploymentConfig(rName string) string { - return fmt.Sprintf(` +const testAccAWSAPIGatewayDeploymentConfig = ` resource "aws_api_gateway_rest_api" "test" { - name = "tf-test-%s" + name = "test" } resource "aws_api_gateway_resource" "test" { @@ -156,11 +151,9 @@ resource "aws_api_gateway_deployment" "test" { rest_api_id = "${aws_api_gateway_rest_api.test.id}" stage_name = "test" description = "This is a test" - xray_tracing_enabled = true variables = { "a" = "2" } } -`, rName) -} +` From 45a6925d2f1114d032c778afafd0f50b797a6196 Mon Sep 17 00:00:00 2001 From: Mathieu Garstecki Date: Wed, 12 Sep 2018 23:21:48 +0200 Subject: [PATCH 125/184] Don't call DeleteUserPermissionsBoundary when deleting a user. --- aws/resource_aws_iam_user.go | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/aws/resource_aws_iam_user.go b/aws/resource_aws_iam_user.go index 00595c91df6..64d21e63927 100644 --- a/aws/resource_aws_iam_user.go +++ b/aws/resource_aws_iam_user.go @@ -275,16 +275,6 @@ func resourceAwsIamUserDelete(d *schema.ResourceData, meta interface{}) error { } } - deleteUserPermissionsBoundaryInput := &iam.DeleteUserPermissionsBoundaryInput{ - UserName: aws.String(d.Id()), - } - - log.Println("[DEBUG] Delete IAM User Permissions Boundary request:", deleteUserPermissionsBoundaryInput) - _, err = iamconn.DeleteUserPermissionsBoundary(deleteUserPermissionsBoundaryInput) - if err != nil && !isAWSErr(err, iam.ErrCodeNoSuchEntityException, "") { - return fmt.Errorf("Error deleting IAM User %s Permissions Boundary: %s", d.Id(), err) - } - deleteUserInput := &iam.DeleteUserInput{ UserName: aws.String(d.Id()), } From ced2fb2d639badcf1526aeeeecdbdbc0814a5031 Mon Sep 17 00:00:00 2001 From: Mathieu Garstecki Date: Wed, 12 Sep 2018 23:58:22 +0200 Subject: [PATCH 126/184] Allow empty permissions_boundary attr on aws_iam_user. --- aws/resource_aws_iam_user.go | 3 +-- aws/resource_aws_iam_user_test.go | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/aws/resource_aws_iam_user.go b/aws/resource_aws_iam_user.go index 00595c91df6..f02dbec0223 100644 --- a/aws/resource_aws_iam_user.go +++ b/aws/resource_aws_iam_user.go @@ -11,7 +11,6 @@ import ( "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" - "github.com/hashicorp/terraform/helper/validation" ) func resourceAwsIamUser() *schema.Resource { @@ -54,7 +53,7 @@ func resourceAwsIamUser() *schema.Resource { "permissions_boundary": { Type: schema.TypeString, Optional: true, - ValidateFunc: validation.StringLenBetween(20, 2048), + ValidateFunc: validateMaxLength(2048), }, "force_destroy": { Type: schema.TypeBool, diff --git a/aws/resource_aws_iam_user_test.go b/aws/resource_aws_iam_user_test.go index 64dd141fd8d..b430a75d78f 100644 --- a/aws/resource_aws_iam_user_test.go +++ b/aws/resource_aws_iam_user_test.go @@ -178,6 +178,7 @@ func TestAccAWSUser_permissionsBoundary(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckAWSUserExists(resourceName, &user), resource.TestCheckResourceAttr(resourceName, "permissions_boundary", permissionsBoundary1), + testAccCheckAWSUserPermissionsBoundary(&user, permissionsBoundary1), ), }, // Test update @@ -186,6 +187,7 @@ func TestAccAWSUser_permissionsBoundary(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckAWSUserExists(resourceName, &user), resource.TestCheckResourceAttr(resourceName, "permissions_boundary", permissionsBoundary2), + testAccCheckAWSUserPermissionsBoundary(&user, permissionsBoundary2), ), }, // Test import @@ -201,6 +203,7 @@ func TestAccAWSUser_permissionsBoundary(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckAWSUserExists(resourceName, &user), resource.TestCheckResourceAttr(resourceName, "permissions_boundary", ""), + testAccCheckAWSUserPermissionsBoundary(&user, ""), ), }, // Test addition @@ -209,6 +212,16 @@ func TestAccAWSUser_permissionsBoundary(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckAWSUserExists(resourceName, &user), resource.TestCheckResourceAttr(resourceName, "permissions_boundary", permissionsBoundary1), + testAccCheckAWSUserPermissionsBoundary(&user, permissionsBoundary1), + ), + }, + // Test empty value + { + Config: testAccAWSUserConfig_permissionsBoundary(rName, ""), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSUserExists(resourceName, &user), + resource.TestCheckResourceAttr(resourceName, "permissions_boundary", ""), + testAccCheckAWSUserPermissionsBoundary(&user, ""), ), }, }, @@ -297,6 +310,22 @@ func testAccCheckAWSUserDisappears(getUserOutput *iam.GetUserOutput) resource.Te } } +func testAccCheckAWSUserPermissionsBoundary(getUserOutput *iam.GetUserOutput, expectedPermissionsBoundaryArn string) resource.TestCheckFunc { + return func(s *terraform.State) error { + actualPermissionsBoundaryArn := "" + + if getUserOutput.User.PermissionsBoundary != nil { + actualPermissionsBoundaryArn = *getUserOutput.User.PermissionsBoundary.PermissionsBoundaryArn + } + + if actualPermissionsBoundaryArn != expectedPermissionsBoundaryArn { + return fmt.Errorf("PermissionsBoundary: '%q', expected '%q'.", actualPermissionsBoundaryArn, expectedPermissionsBoundaryArn) + } + + return nil + } +} + func testAccAWSUserConfig(rName, path string) string { return fmt.Sprintf(` resource "aws_iam_user" "user" { From d24e4e38b34690315e1e3783f0f32d689c155f0d Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 12 Sep 2018 21:37:56 -0400 Subject: [PATCH 127/184] Update CHANGELOG for #5815 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2a7da3d408d..c046a71ba26 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ ENHANCEMENTS: BUG FIXES: +* resource/aws_iam_policy: Ensure `description` is available as an attribute when empty [GH-5815] * resource/aws_lambda_function: Retry on `InvalidParameterValueException` errors relating to KMS-backed environment variables [GH-5849] * resource/aws_launch_template: Ensure `ebs_optimized` argument accepts "unspecified" value [GH-5627] From 27b394d267b9b42b3e7c2a41e1169b3b2c83f952 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 12 Sep 2018 21:57:53 -0400 Subject: [PATCH 128/184] Update CHANGELOG for #5817 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c046a71ba26..426e64844fe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ FEATURES: ENHANCEMENTS: * data-source/aws_db_instance: Add `enabled_cloudwatch_logs_exports` attribute [GH-5801] +* resource/aws_api_gateway_stage: Add `xray_tracing_enabled` argument [GH-5817] * resource/aws_cloudfront_distribution: Add `lambda_function_association` `include_body` argument [GH-5681] * resource/aws_db_instance: Add `domain` and `domain_iam_role_name` arguments (support for domain joining RDS instances) [GH-5378] * resource/aws_ecs_task_definition: Suppress `container_definition` differences for equivalent port and host mappings [GH-5833] From 60b39f62e175c4de42a1052eb256195aeb9df77a Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 12 Sep 2018 22:01:43 -0400 Subject: [PATCH 129/184] docs/resource/aws_api_gateway_stage: Add xray_tracing_enabled argument --- website/docs/r/api_gateway_stage.html.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/website/docs/r/api_gateway_stage.html.markdown b/website/docs/r/api_gateway_stage.html.markdown index f0829c705fe..e891ad2dd22 100644 --- a/website/docs/r/api_gateway_stage.html.markdown +++ b/website/docs/r/api_gateway_stage.html.markdown @@ -78,6 +78,7 @@ The following arguments are supported: * `documentation_version` - (Optional) The version of the associated API documentation * `variables` - (Optional) A map that defines the stage variables * `tags` - (Optional) A mapping of tags to assign to the resource. +* `xray_tracing_enabled` - (Optional) Whether active tracing with X-ray is enabled. Defaults to `false`. ### Nested Blocks From 201f4352d9055a2afe7a9aa608e0b327cc024dc6 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 12 Sep 2018 22:07:54 -0400 Subject: [PATCH 130/184] Update CHANGELOG for #5857 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 426e64844fe..d4de21efd5c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ ENHANCEMENTS: BUG FIXES: * resource/aws_iam_policy: Ensure `description` is available as an attribute when empty [GH-5815] +* resource/aws_iam_user: Remove extraneous `DeleteUserPermissionsBoundary` API call during deletion [GH-5857] * resource/aws_lambda_function: Retry on `InvalidParameterValueException` errors relating to KMS-backed environment variables [GH-5849] * resource/aws_launch_template: Ensure `ebs_optimized` argument accepts "unspecified" value [GH-5627] From 1655975b2a4d21763d1a2f0b7bd5cc55e2a69b93 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 12 Sep 2018 22:23:39 -0400 Subject: [PATCH 131/184] Update CHANGELOG for #5859 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d4de21efd5c..2e9e70bb9eb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ ENHANCEMENTS: * resource/aws_db_instance: Add `domain` and `domain_iam_role_name` arguments (support for domain joining RDS instances) [GH-5378] * resource/aws_ecs_task_definition: Suppress `container_definition` differences for equivalent port and host mappings [GH-5833] * resource/aws_ecs_task_definition: Add docker volume configuration [GH-5727] +* resource/aws_iam_role: Allow empty string (`""`) value for `permissions_boundary` argument [GH-5859] * resource/aws_iot_topic_rule: Add `firehose` `seperator` argument [GH-5734] * resource/aws_launch_template: Allow `network_interface` `ipv4_address_count` configuration [GH-5830] * resource/aws_ssm_document: Add support for `Session` `document_type` [GH-5850] From 03d4a36636b3d252b51bbfade94a0bab9d6b053b Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 12 Sep 2018 22:24:30 -0400 Subject: [PATCH 132/184] aws_iam_user not aws_iam_role for #5859 CHANGELOG :) --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2e9e70bb9eb..beddddc3513 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,7 +12,7 @@ ENHANCEMENTS: * resource/aws_db_instance: Add `domain` and `domain_iam_role_name` arguments (support for domain joining RDS instances) [GH-5378] * resource/aws_ecs_task_definition: Suppress `container_definition` differences for equivalent port and host mappings [GH-5833] * resource/aws_ecs_task_definition: Add docker volume configuration [GH-5727] -* resource/aws_iam_role: Allow empty string (`""`) value for `permissions_boundary` argument [GH-5859] +* resource/aws_iam_user: Allow empty string (`""`) value for `permissions_boundary` argument [GH-5859] * resource/aws_iot_topic_rule: Add `firehose` `seperator` argument [GH-5734] * resource/aws_launch_template: Allow `network_interface` `ipv4_address_count` configuration [GH-5830] * resource/aws_ssm_document: Add support for `Session` `document_type` [GH-5850] From 9bbff73e062b92859fa9d26a793d69640b425ad2 Mon Sep 17 00:00:00 2001 From: tf-release-bot Date: Thu, 13 Sep 2018 02:38:41 +0000 Subject: [PATCH 133/184] v1.36.0 --- CHANGELOG.md | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index beddddc3513..df2ec899b2b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,28 +1,28 @@ -## 1.36.0 (Unreleased) +## 1.36.0 (September 13, 2018) FEATURES: -* **New Resource:** `aws_cloudfront_public_key` [GH-5737] +* **New Resource:** `aws_cloudfront_public_key` ([#5737](https://github.com/terraform-providers/terraform-provider-aws/issues/5737)) ENHANCEMENTS: -* data-source/aws_db_instance: Add `enabled_cloudwatch_logs_exports` attribute [GH-5801] -* resource/aws_api_gateway_stage: Add `xray_tracing_enabled` argument [GH-5817] -* resource/aws_cloudfront_distribution: Add `lambda_function_association` `include_body` argument [GH-5681] -* resource/aws_db_instance: Add `domain` and `domain_iam_role_name` arguments (support for domain joining RDS instances) [GH-5378] -* resource/aws_ecs_task_definition: Suppress `container_definition` differences for equivalent port and host mappings [GH-5833] -* resource/aws_ecs_task_definition: Add docker volume configuration [GH-5727] -* resource/aws_iam_user: Allow empty string (`""`) value for `permissions_boundary` argument [GH-5859] -* resource/aws_iot_topic_rule: Add `firehose` `seperator` argument [GH-5734] -* resource/aws_launch_template: Allow `network_interface` `ipv4_address_count` configuration [GH-5830] -* resource/aws_ssm_document: Add support for `Session` `document_type` [GH-5850] +* data-source/aws_db_instance: Add `enabled_cloudwatch_logs_exports` attribute ([#5801](https://github.com/terraform-providers/terraform-provider-aws/issues/5801)) +* resource/aws_api_gateway_stage: Add `xray_tracing_enabled` argument ([#5817](https://github.com/terraform-providers/terraform-provider-aws/issues/5817)) +* resource/aws_cloudfront_distribution: Add `lambda_function_association` `include_body` argument ([#5681](https://github.com/terraform-providers/terraform-provider-aws/issues/5681)) +* resource/aws_db_instance: Add `domain` and `domain_iam_role_name` arguments (support for domain joining RDS instances) ([#5378](https://github.com/terraform-providers/terraform-provider-aws/issues/5378)) +* resource/aws_ecs_task_definition: Suppress `container_definition` differences for equivalent port and host mappings ([#5833](https://github.com/terraform-providers/terraform-provider-aws/issues/5833)) +* resource/aws_ecs_task_definition: Add docker volume configuration ([#5727](https://github.com/terraform-providers/terraform-provider-aws/issues/5727)) +* resource/aws_iam_user: Allow empty string (`""`) value for `permissions_boundary` argument ([#5859](https://github.com/terraform-providers/terraform-provider-aws/issues/5859)) +* resource/aws_iot_topic_rule: Add `firehose` `seperator` argument ([#5734](https://github.com/terraform-providers/terraform-provider-aws/issues/5734)) +* resource/aws_launch_template: Allow `network_interface` `ipv4_address_count` configuration ([#5830](https://github.com/terraform-providers/terraform-provider-aws/issues/5830)) +* resource/aws_ssm_document: Add support for `Session` `document_type` ([#5850](https://github.com/terraform-providers/terraform-provider-aws/issues/5850)) BUG FIXES: -* resource/aws_iam_policy: Ensure `description` is available as an attribute when empty [GH-5815] -* resource/aws_iam_user: Remove extraneous `DeleteUserPermissionsBoundary` API call during deletion [GH-5857] -* resource/aws_lambda_function: Retry on `InvalidParameterValueException` errors relating to KMS-backed environment variables [GH-5849] -* resource/aws_launch_template: Ensure `ebs_optimized` argument accepts "unspecified" value [GH-5627] +* resource/aws_iam_policy: Ensure `description` is available as an attribute when empty ([#5815](https://github.com/terraform-providers/terraform-provider-aws/issues/5815)) +* resource/aws_iam_user: Remove extraneous `DeleteUserPermissionsBoundary` API call during deletion ([#5857](https://github.com/terraform-providers/terraform-provider-aws/issues/5857)) +* resource/aws_lambda_function: Retry on `InvalidParameterValueException` errors relating to KMS-backed environment variables ([#5849](https://github.com/terraform-providers/terraform-provider-aws/issues/5849)) +* resource/aws_launch_template: Ensure `ebs_optimized` argument accepts "unspecified" value ([#5627](https://github.com/terraform-providers/terraform-provider-aws/issues/5627)) ## 1.35.0 (September 06, 2018) From f1a0ca37b4b4769fc35688a6049a612c992fa7fd Mon Sep 17 00:00:00 2001 From: tf-release-bot Date: Thu, 13 Sep 2018 02:46:42 +0000 Subject: [PATCH 134/184] Cleanup after v1.36.0 release --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index df2ec899b2b..0292b547ed8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,4 @@ +## 1.37.0 (Unreleased) ## 1.36.0 (September 13, 2018) FEATURES: From ecf848a9364cd52d66b23b498794b03d86d6a9a1 Mon Sep 17 00:00:00 2001 From: saravanan30erd Date: Thu, 13 Sep 2018 18:40:58 +0400 Subject: [PATCH 135/184] replace validateMaxLength with validation.StringLenBetween --- aws/data_source_aws_codecommit_repository.go | 3 ++- aws/data_source_aws_efs_file_system.go | 3 ++- aws/data_source_aws_iam_server_certificate.go | 5 +++-- aws/resource_aws_appautoscaling_policy.go | 4 ++-- aws/resource_aws_autoscaling_group.go | 4 ++-- aws/resource_aws_cloudwatch_event_rule.go | 7 ++++--- aws/resource_aws_cloudwatch_log_metric_filter.go | 5 +++-- aws/resource_aws_codebuild_project.go | 2 +- aws/resource_aws_codecommit_repository.go | 5 +++-- aws/resource_aws_codedeploy_deployment_group.go | 6 +++--- aws/resource_aws_cognito_user_group.go | 3 ++- aws/resource_aws_config_config_rule.go | 14 +++++++------- ...resource_aws_config_configuration_aggregator.go | 3 ++- aws/resource_aws_config_configuration_recorder.go | 3 ++- aws/resource_aws_config_delivery_channel.go | 3 ++- aws/resource_aws_efs_file_system.go | 2 +- aws/resource_aws_emr_security_configuration.go | 5 +++-- aws/resource_aws_iam_role.go | 2 +- aws/resource_aws_iam_server_certificate.go | 5 +++-- aws/resource_aws_iam_user.go | 3 ++- aws/resource_aws_instance.go | 3 ++- aws/resource_aws_key_pair.go | 5 +++-- aws/resource_aws_lb_listener_rule.go | 2 +- aws/resource_aws_lb_target_group.go | 4 ++-- aws/resource_aws_s3_bucket.go | 6 +++--- aws/resource_aws_s3_bucket_inventory.go | 2 +- aws/resource_aws_security_group.go | 7 ++++--- aws/resource_aws_servicecatalog_portfolio.go | 2 +- aws/resource_aws_ses_template.go | 4 ++-- aws/resource_aws_sfn_activity.go | 3 ++- aws/resource_aws_sfn_state_machine.go | 3 ++- aws/resource_aws_waf_rate_based_rule.go | 2 +- aws/resource_aws_waf_rule.go | 3 ++- aws/resource_aws_wafregional_rate_based_rule.go | 2 +- 34 files changed, 77 insertions(+), 58 deletions(-) diff --git a/aws/data_source_aws_codecommit_repository.go b/aws/data_source_aws_codecommit_repository.go index 163a4b2e3b7..aec07a0e018 100644 --- a/aws/data_source_aws_codecommit_repository.go +++ b/aws/data_source_aws_codecommit_repository.go @@ -7,6 +7,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/codecommit" "github.com/hashicorp/terraform/helper/schema" + "github.com/hashicorp/terraform/helper/validation" ) func dataSourceAwsCodeCommitRepository() *schema.Resource { @@ -18,7 +19,7 @@ func dataSourceAwsCodeCommitRepository() *schema.Resource { Type: schema.TypeString, Required: true, ForceNew: true, - ValidateFunc: validateMaxLength(100), + ValidateFunc: validation.StringLenBetween(0, 100), }, "arn": { diff --git a/aws/data_source_aws_efs_file_system.go b/aws/data_source_aws_efs_file_system.go index ab518d6f80c..f448badaa99 100644 --- a/aws/data_source_aws_efs_file_system.go +++ b/aws/data_source_aws_efs_file_system.go @@ -8,6 +8,7 @@ import ( "github.com/aws/aws-sdk-go/service/efs" "github.com/hashicorp/errwrap" "github.com/hashicorp/terraform/helper/schema" + "github.com/hashicorp/terraform/helper/validation" ) func dataSourceAwsEfsFileSystem() *schema.Resource { @@ -20,7 +21,7 @@ func dataSourceAwsEfsFileSystem() *schema.Resource { Optional: true, Computed: true, ForceNew: true, - ValidateFunc: validateMaxLength(64), + ValidateFunc: validation.StringLenBetween(0, 64), }, "encrypted": { Type: schema.TypeBool, diff --git a/aws/data_source_aws_iam_server_certificate.go b/aws/data_source_aws_iam_server_certificate.go index a628806ed41..49feefa2398 100644 --- a/aws/data_source_aws_iam_server_certificate.go +++ b/aws/data_source_aws_iam_server_certificate.go @@ -12,6 +12,7 @@ import ( "github.com/hashicorp/errwrap" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" + "github.com/hashicorp/terraform/helper/validation" ) func dataSourceAwsIAMServerCertificate() *schema.Resource { @@ -25,7 +26,7 @@ func dataSourceAwsIAMServerCertificate() *schema.Resource { Computed: true, ForceNew: true, ConflictsWith: []string{"name_prefix"}, - ValidateFunc: validateMaxLength(128), + ValidateFunc: validation.StringLenBetween(0, 128), }, "name_prefix": { @@ -33,7 +34,7 @@ func dataSourceAwsIAMServerCertificate() *schema.Resource { Optional: true, ForceNew: true, ConflictsWith: []string{"name"}, - ValidateFunc: validateMaxLength(128 - resource.UniqueIDSuffixLength), + ValidateFunc: validation.StringLenBetween(0, 128-resource.UniqueIDSuffixLength), }, "path_prefix": { diff --git a/aws/resource_aws_appautoscaling_policy.go b/aws/resource_aws_appautoscaling_policy.go index 4324b531e60..8c8c50aad60 100644 --- a/aws/resource_aws_appautoscaling_policy.go +++ b/aws/resource_aws_appautoscaling_policy.go @@ -28,7 +28,7 @@ func resourceAwsAppautoscalingPolicy() *schema.Resource { Required: true, ForceNew: true, // https://github.com/boto/botocore/blob/9f322b1/botocore/data/autoscaling/2011-01-01/service-2.json#L1862-L1873 - ValidateFunc: validateMaxLength(255), + ValidateFunc: validation.StringLenBetween(0, 255), }, "arn": { Type: schema.TypeString, @@ -217,7 +217,7 @@ func resourceAwsAppautoscalingPolicy() *schema.Resource { "resource_label": { Type: schema.TypeString, Optional: true, - ValidateFunc: validateMaxLength(1023), + ValidateFunc: validation.StringLenBetween(0, 1023), }, }, }, diff --git a/aws/resource_aws_autoscaling_group.go b/aws/resource_aws_autoscaling_group.go index dc35530aacd..c18075a9d80 100644 --- a/aws/resource_aws_autoscaling_group.go +++ b/aws/resource_aws_autoscaling_group.go @@ -40,13 +40,13 @@ func resourceAwsAutoscalingGroup() *schema.Resource { Computed: true, ForceNew: true, ConflictsWith: []string{"name_prefix"}, - ValidateFunc: validateMaxLength(255), + ValidateFunc: validation.StringLenBetween(0, 255), }, "name_prefix": { Type: schema.TypeString, Optional: true, ForceNew: true, - ValidateFunc: validateMaxLength(255 - resource.UniqueIDSuffixLength), + ValidateFunc: validation.StringLenBetween(0, 255-resource.UniqueIDSuffixLength), }, "launch_configuration": { diff --git a/aws/resource_aws_cloudwatch_event_rule.go b/aws/resource_aws_cloudwatch_event_rule.go index 3ff15d37e90..9f349380c78 100644 --- a/aws/resource_aws_cloudwatch_event_rule.go +++ b/aws/resource_aws_cloudwatch_event_rule.go @@ -13,6 +13,7 @@ import ( "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/structure" + "github.com/hashicorp/terraform/helper/validation" ) func resourceAwsCloudWatchEventRule() *schema.Resource { @@ -43,7 +44,7 @@ func resourceAwsCloudWatchEventRule() *schema.Resource { "schedule_expression": { Type: schema.TypeString, Optional: true, - ValidateFunc: validateMaxLength(256), + ValidateFunc: validation.StringLenBetween(0, 256), }, "event_pattern": { Type: schema.TypeString, @@ -57,12 +58,12 @@ func resourceAwsCloudWatchEventRule() *schema.Resource { "description": { Type: schema.TypeString, Optional: true, - ValidateFunc: validateMaxLength(512), + ValidateFunc: validation.StringLenBetween(0, 512), }, "role_arn": { Type: schema.TypeString, Optional: true, - ValidateFunc: validateMaxLength(1600), + ValidateFunc: validation.StringLenBetween(0, 1600), }, "is_enabled": { Type: schema.TypeBool, diff --git a/aws/resource_aws_cloudwatch_log_metric_filter.go b/aws/resource_aws_cloudwatch_log_metric_filter.go index 80ea7cfdf61..7abaec78f36 100644 --- a/aws/resource_aws_cloudwatch_log_metric_filter.go +++ b/aws/resource_aws_cloudwatch_log_metric_filter.go @@ -7,6 +7,7 @@ import ( "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" + "github.com/hashicorp/terraform/helper/validation" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/awserr" @@ -31,7 +32,7 @@ func resourceAwsCloudWatchLogMetricFilter() *schema.Resource { "pattern": { Type: schema.TypeString, Required: true, - ValidateFunc: validateMaxLength(1024), + ValidateFunc: validation.StringLenBetween(0, 1024), StateFunc: func(v interface{}) string { s, ok := v.(string) if !ok { @@ -67,7 +68,7 @@ func resourceAwsCloudWatchLogMetricFilter() *schema.Resource { "value": { Type: schema.TypeString, Required: true, - ValidateFunc: validateMaxLength(100), + ValidateFunc: validation.StringLenBetween(0, 100), }, "default_value": { Type: schema.TypeFloat, diff --git a/aws/resource_aws_codebuild_project.go b/aws/resource_aws_codebuild_project.go index c7a95f6f38a..b08895b8a7e 100644 --- a/aws/resource_aws_codebuild_project.go +++ b/aws/resource_aws_codebuild_project.go @@ -108,7 +108,7 @@ func resourceAwsCodeBuildProject() *schema.Resource { Type: schema.TypeString, Optional: true, Computed: true, - ValidateFunc: validateMaxLength(255), + ValidateFunc: validation.StringLenBetween(0, 255), }, "encryption_key": { Type: schema.TypeString, diff --git a/aws/resource_aws_codecommit_repository.go b/aws/resource_aws_codecommit_repository.go index 57cdfb4a3e8..1cb77a1d9fc 100644 --- a/aws/resource_aws_codecommit_repository.go +++ b/aws/resource_aws_codecommit_repository.go @@ -7,6 +7,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/codecommit" "github.com/hashicorp/terraform/helper/schema" + "github.com/hashicorp/terraform/helper/validation" ) func resourceAwsCodeCommitRepository() *schema.Resource { @@ -24,13 +25,13 @@ func resourceAwsCodeCommitRepository() *schema.Resource { Type: schema.TypeString, Required: true, ForceNew: true, - ValidateFunc: validateMaxLength(100), + ValidateFunc: validation.StringLenBetween(0, 100), }, "description": { Type: schema.TypeString, Optional: true, - ValidateFunc: validateMaxLength(1000), + ValidateFunc: validation.StringLenBetween(0, 1000), }, "arn": { diff --git a/aws/resource_aws_codedeploy_deployment_group.go b/aws/resource_aws_codedeploy_deployment_group.go index cc28bd05293..310422dce6c 100644 --- a/aws/resource_aws_codedeploy_deployment_group.go +++ b/aws/resource_aws_codedeploy_deployment_group.go @@ -29,14 +29,14 @@ func resourceAwsCodeDeployDeploymentGroup() *schema.Resource { "app_name": { Type: schema.TypeString, Required: true, - ValidateFunc: validateMaxLength(100), + ValidateFunc: validation.StringLenBetween(0, 100), }, "deployment_group_name": { Type: schema.TypeString, Required: true, ForceNew: true, - ValidateFunc: validateMaxLength(100), + ValidateFunc: validation.StringLenBetween(0, 100), }, "deployment_style": { @@ -242,7 +242,7 @@ func resourceAwsCodeDeployDeploymentGroup() *schema.Resource { Type: schema.TypeString, Optional: true, Default: "CodeDeployDefault.OneAtATime", - ValidateFunc: validateMaxLength(100), + ValidateFunc: validation.StringLenBetween(0, 100), }, "ec2_tag_set": { diff --git a/aws/resource_aws_cognito_user_group.go b/aws/resource_aws_cognito_user_group.go index 98f9748ff3e..c294665cd2e 100644 --- a/aws/resource_aws_cognito_user_group.go +++ b/aws/resource_aws_cognito_user_group.go @@ -9,6 +9,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/cognitoidentityprovider" "github.com/hashicorp/terraform/helper/schema" + "github.com/hashicorp/terraform/helper/validation" ) func resourceAwsCognitoUserGroup() *schema.Resource { @@ -27,7 +28,7 @@ func resourceAwsCognitoUserGroup() *schema.Resource { "description": { Type: schema.TypeString, Optional: true, - ValidateFunc: validateMaxLength(2048), + ValidateFunc: validation.StringLenBetween(0, 2048), }, "name": { Type: schema.TypeString, diff --git a/aws/resource_aws_config_config_rule.go b/aws/resource_aws_config_config_rule.go index 9f055b5b6d6..f957a7d430c 100644 --- a/aws/resource_aws_config_config_rule.go +++ b/aws/resource_aws_config_config_rule.go @@ -31,7 +31,7 @@ func resourceAwsConfigConfigRule() *schema.Resource { "name": { Type: schema.TypeString, Required: true, - ValidateFunc: validateMaxLength(64), + ValidateFunc: validation.StringLenBetween(0, 64), }, "rule_id": { Type: schema.TypeString, @@ -44,7 +44,7 @@ func resourceAwsConfigConfigRule() *schema.Resource { "description": { Type: schema.TypeString, Optional: true, - ValidateFunc: validateMaxLength(256), + ValidateFunc: validation.StringLenBetween(0, 256), }, "input_parameters": { Type: schema.TypeString, @@ -65,7 +65,7 @@ func resourceAwsConfigConfigRule() *schema.Resource { "compliance_resource_id": { Type: schema.TypeString, Optional: true, - ValidateFunc: validateMaxLength(256), + ValidateFunc: validation.StringLenBetween(0, 256), }, "compliance_resource_types": { Type: schema.TypeSet, @@ -73,19 +73,19 @@ func resourceAwsConfigConfigRule() *schema.Resource { MaxItems: 100, Elem: &schema.Schema{ Type: schema.TypeString, - ValidateFunc: validateMaxLength(256), + ValidateFunc: validation.StringLenBetween(0, 256), }, Set: schema.HashString, }, "tag_key": { Type: schema.TypeString, Optional: true, - ValidateFunc: validateMaxLength(128), + ValidateFunc: validation.StringLenBetween(0, 128), }, "tag_value": { Type: schema.TypeString, Optional: true, - ValidateFunc: validateMaxLength(256), + ValidateFunc: validation.StringLenBetween(0, 256), }, }, }, @@ -131,7 +131,7 @@ func resourceAwsConfigConfigRule() *schema.Resource { "source_identifier": { Type: schema.TypeString, Required: true, - ValidateFunc: validateMaxLength(256), + ValidateFunc: validation.StringLenBetween(0, 256), }, }, }, diff --git a/aws/resource_aws_config_configuration_aggregator.go b/aws/resource_aws_config_configuration_aggregator.go index 7224331f980..0d48fc83f09 100644 --- a/aws/resource_aws_config_configuration_aggregator.go +++ b/aws/resource_aws_config_configuration_aggregator.go @@ -10,6 +10,7 @@ import ( "github.com/hashicorp/terraform/helper/customdiff" "github.com/hashicorp/terraform/helper/schema" + "github.com/hashicorp/terraform/helper/validation" ) func resourceAwsConfigConfigurationAggregator() *schema.Resource { @@ -43,7 +44,7 @@ func resourceAwsConfigConfigurationAggregator() *schema.Resource { Type: schema.TypeString, Required: true, ForceNew: true, - ValidateFunc: validateMaxLength(256), + ValidateFunc: validation.StringLenBetween(0, 256), }, "account_aggregation_source": { Type: schema.TypeList, diff --git a/aws/resource_aws_config_configuration_recorder.go b/aws/resource_aws_config_configuration_recorder.go index df8319bce33..91dd99886fa 100644 --- a/aws/resource_aws_config_configuration_recorder.go +++ b/aws/resource_aws_config_configuration_recorder.go @@ -5,6 +5,7 @@ import ( "log" "github.com/hashicorp/terraform/helper/schema" + "github.com/hashicorp/terraform/helper/validation" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/awserr" @@ -28,7 +29,7 @@ func resourceAwsConfigConfigurationRecorder() *schema.Resource { Optional: true, ForceNew: true, Default: "default", - ValidateFunc: validateMaxLength(256), + ValidateFunc: validation.StringLenBetween(0, 256), }, "role_arn": { Type: schema.TypeString, diff --git a/aws/resource_aws_config_delivery_channel.go b/aws/resource_aws_config_delivery_channel.go index f2fbe930ffa..95bff5548da 100644 --- a/aws/resource_aws_config_delivery_channel.go +++ b/aws/resource_aws_config_delivery_channel.go @@ -7,6 +7,7 @@ import ( "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" + "github.com/hashicorp/terraform/helper/validation" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/awserr" @@ -30,7 +31,7 @@ func resourceAwsConfigDeliveryChannel() *schema.Resource { Optional: true, ForceNew: true, Default: "default", - ValidateFunc: validateMaxLength(256), + ValidateFunc: validation.StringLenBetween(0, 256), }, "s3_bucket_name": { Type: schema.TypeString, diff --git a/aws/resource_aws_efs_file_system.go b/aws/resource_aws_efs_file_system.go index df70788150b..2caf27e1c50 100644 --- a/aws/resource_aws_efs_file_system.go +++ b/aws/resource_aws_efs_file_system.go @@ -31,7 +31,7 @@ func resourceAwsEfsFileSystem() *schema.Resource { Optional: true, Computed: true, ForceNew: true, - ValidateFunc: validateMaxLength(64), + ValidateFunc: validation.StringLenBetween(0, 64), }, "reference_name": { diff --git a/aws/resource_aws_emr_security_configuration.go b/aws/resource_aws_emr_security_configuration.go index 0cb3131513f..caaca37889c 100644 --- a/aws/resource_aws_emr_security_configuration.go +++ b/aws/resource_aws_emr_security_configuration.go @@ -7,6 +7,7 @@ import ( "github.com/aws/aws-sdk-go/service/emr" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" + "github.com/hashicorp/terraform/helper/validation" ) func resourceAwsEMRSecurityConfiguration() *schema.Resource { @@ -25,14 +26,14 @@ func resourceAwsEMRSecurityConfiguration() *schema.Resource { Computed: true, ForceNew: true, ConflictsWith: []string{"name_prefix"}, - ValidateFunc: validateMaxLength(10280), + ValidateFunc: validation.StringLenBetween(0, 10280), }, "name_prefix": { Type: schema.TypeString, Optional: true, ForceNew: true, ConflictsWith: []string{"name"}, - ValidateFunc: validateMaxLength(10280 - resource.UniqueIDSuffixLength), + ValidateFunc: validation.StringLenBetween(0, 10280-resource.UniqueIDSuffixLength), }, "configuration": { diff --git a/aws/resource_aws_iam_role.go b/aws/resource_aws_iam_role.go index fdbda1f7660..a4e2bc42f1b 100644 --- a/aws/resource_aws_iam_role.go +++ b/aws/resource_aws_iam_role.go @@ -87,7 +87,7 @@ func resourceAwsIamRole() *schema.Resource { "permissions_boundary": { Type: schema.TypeString, Optional: true, - ValidateFunc: validateMaxLength(2048), + ValidateFunc: validation.StringLenBetween(0, 2048), }, "description": { diff --git a/aws/resource_aws_iam_server_certificate.go b/aws/resource_aws_iam_server_certificate.go index 2a14150ec5f..ed2b963f070 100644 --- a/aws/resource_aws_iam_server_certificate.go +++ b/aws/resource_aws_iam_server_certificate.go @@ -15,6 +15,7 @@ import ( "github.com/aws/aws-sdk-go/service/iam" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" + "github.com/hashicorp/terraform/helper/validation" ) func resourceAwsIAMServerCertificate() *schema.Resource { @@ -62,7 +63,7 @@ func resourceAwsIAMServerCertificate() *schema.Resource { Computed: true, ForceNew: true, ConflictsWith: []string{"name_prefix"}, - ValidateFunc: validateMaxLength(128), + ValidateFunc: validation.StringLenBetween(0, 128), }, "name_prefix": { @@ -70,7 +71,7 @@ func resourceAwsIAMServerCertificate() *schema.Resource { Optional: true, ForceNew: true, ConflictsWith: []string{"name"}, - ValidateFunc: validateMaxLength(128 - resource.UniqueIDSuffixLength), + ValidateFunc: validation.StringLenBetween(0, 128-resource.UniqueIDSuffixLength), }, "arn": { diff --git a/aws/resource_aws_iam_user.go b/aws/resource_aws_iam_user.go index b541be2f394..7501bb0b589 100644 --- a/aws/resource_aws_iam_user.go +++ b/aws/resource_aws_iam_user.go @@ -11,6 +11,7 @@ import ( "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" + "github.com/hashicorp/terraform/helper/validation" ) func resourceAwsIamUser() *schema.Resource { @@ -53,7 +54,7 @@ func resourceAwsIamUser() *schema.Resource { "permissions_boundary": { Type: schema.TypeString, Optional: true, - ValidateFunc: validateMaxLength(2048), + ValidateFunc: validation.StringLenBetween(0, 2048), }, "force_destroy": { Type: schema.TypeBool, diff --git a/aws/resource_aws_instance.go b/aws/resource_aws_instance.go index 5e540477fb9..8115b461d89 100644 --- a/aws/resource_aws_instance.go +++ b/aws/resource_aws_instance.go @@ -18,6 +18,7 @@ import ( "github.com/hashicorp/terraform/helper/hashcode" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" + "github.com/hashicorp/terraform/helper/validation" ) func resourceAwsInstance() *schema.Resource { @@ -142,7 +143,7 @@ func resourceAwsInstance() *schema.Resource { return "" } }, - ValidateFunc: validateMaxLength(16384), + ValidateFunc: validation.StringLenBetween(0, 16384), }, "user_data_base64": { diff --git a/aws/resource_aws_key_pair.go b/aws/resource_aws_key_pair.go index 971c817379a..48f954b9cca 100644 --- a/aws/resource_aws_key_pair.go +++ b/aws/resource_aws_key_pair.go @@ -6,6 +6,7 @@ import ( "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" + "github.com/hashicorp/terraform/helper/validation" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/awserr" @@ -32,14 +33,14 @@ func resourceAwsKeyPair() *schema.Resource { Computed: true, ForceNew: true, ConflictsWith: []string{"key_name_prefix"}, - ValidateFunc: validateMaxLength(255), + ValidateFunc: validation.StringLenBetween(0, 255), }, "key_name_prefix": { Type: schema.TypeString, Optional: true, ForceNew: true, ConflictsWith: []string{"key_name"}, - ValidateFunc: validateMaxLength(255 - resource.UniqueIDSuffixLength), + ValidateFunc: validation.StringLenBetween(0, 255-resource.UniqueIDSuffixLength), }, "public_key": { Type: schema.TypeString, diff --git a/aws/resource_aws_lb_listener_rule.go b/aws/resource_aws_lb_listener_rule.go index 96b1d7ba36a..7eac9c02fc6 100644 --- a/aws/resource_aws_lb_listener_rule.go +++ b/aws/resource_aws_lb_listener_rule.go @@ -163,7 +163,7 @@ func resourceAwsLbbListenerRule() *schema.Resource { "field": { Type: schema.TypeString, Optional: true, - ValidateFunc: validateMaxLength(64), + ValidateFunc: validation.StringLenBetween(0, 64), }, "values": { Type: schema.TypeList, diff --git a/aws/resource_aws_lb_target_group.go b/aws/resource_aws_lb_target_group.go index 47798903d67..79b8daf2516 100644 --- a/aws/resource_aws_lb_target_group.go +++ b/aws/resource_aws_lb_target_group.go @@ -45,14 +45,14 @@ func resourceAwsLbTargetGroup() *schema.Resource { Computed: true, ForceNew: true, ConflictsWith: []string{"name_prefix"}, - ValidateFunc: validateMaxLength(32), + ValidateFunc: validation.StringLenBetween(0, 32), }, "name_prefix": { Type: schema.TypeString, Optional: true, ForceNew: true, ConflictsWith: []string{"name"}, - ValidateFunc: validateMaxLength(32 - resource.UniqueIDSuffixLength), + ValidateFunc: validation.StringLenBetween(0, 32-resource.UniqueIDSuffixLength), }, "port": { diff --git a/aws/resource_aws_s3_bucket.go b/aws/resource_aws_s3_bucket.go index e304cd614ed..e0a3f5f8f8c 100644 --- a/aws/resource_aws_s3_bucket.go +++ b/aws/resource_aws_s3_bucket.go @@ -224,7 +224,7 @@ func resourceAwsS3Bucket() *schema.Resource { Type: schema.TypeString, Optional: true, Computed: true, - ValidateFunc: validateMaxLength(255), + ValidateFunc: validation.StringLenBetween(0, 255), }, "prefix": { Type: schema.TypeString, @@ -368,7 +368,7 @@ func resourceAwsS3Bucket() *schema.Resource { "id": { Type: schema.TypeString, Optional: true, - ValidateFunc: validateMaxLength(255), + ValidateFunc: validation.StringLenBetween(0, 255), }, "destination": { Type: schema.TypeSet, @@ -429,7 +429,7 @@ func resourceAwsS3Bucket() *schema.Resource { "prefix": { Type: schema.TypeString, Required: true, - ValidateFunc: validateMaxLength(1024), + ValidateFunc: validation.StringLenBetween(0, 1024), }, "status": { Type: schema.TypeString, diff --git a/aws/resource_aws_s3_bucket_inventory.go b/aws/resource_aws_s3_bucket_inventory.go index e9b56cbec3b..cf4fdc60d2c 100644 --- a/aws/resource_aws_s3_bucket_inventory.go +++ b/aws/resource_aws_s3_bucket_inventory.go @@ -34,7 +34,7 @@ func resourceAwsS3BucketInventory() *schema.Resource { Type: schema.TypeString, Required: true, ForceNew: true, - ValidateFunc: validateMaxLength(64), + ValidateFunc: validation.StringLenBetween(0, 64), }, "enabled": { Type: schema.TypeBool, diff --git a/aws/resource_aws_security_group.go b/aws/resource_aws_security_group.go index b5e680d46b1..ea26101fd23 100644 --- a/aws/resource_aws_security_group.go +++ b/aws/resource_aws_security_group.go @@ -16,6 +16,7 @@ import ( "github.com/hashicorp/terraform/helper/hashcode" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" + "github.com/hashicorp/terraform/helper/validation" ) func resourceAwsSecurityGroup() *schema.Resource { @@ -43,7 +44,7 @@ func resourceAwsSecurityGroup() *schema.Resource { Computed: true, ForceNew: true, ConflictsWith: []string{"name_prefix"}, - ValidateFunc: validateMaxLength(255), + ValidateFunc: validation.StringLenBetween(0, 255), }, "name_prefix": { @@ -51,7 +52,7 @@ func resourceAwsSecurityGroup() *schema.Resource { Optional: true, ForceNew: true, ConflictsWith: []string{"name"}, - ValidateFunc: validateMaxLength(100), + ValidateFunc: validation.StringLenBetween(0, 100), }, "description": { @@ -59,7 +60,7 @@ func resourceAwsSecurityGroup() *schema.Resource { Optional: true, ForceNew: true, Default: "Managed by Terraform", - ValidateFunc: validateMaxLength(255), + ValidateFunc: validation.StringLenBetween(0, 255), }, "vpc_id": { diff --git a/aws/resource_aws_servicecatalog_portfolio.go b/aws/resource_aws_servicecatalog_portfolio.go index 161550ccc4a..1fe71297251 100644 --- a/aws/resource_aws_servicecatalog_portfolio.go +++ b/aws/resource_aws_servicecatalog_portfolio.go @@ -47,7 +47,7 @@ func resourceAwsServiceCatalogPortfolio() *schema.Resource { Type: schema.TypeString, Optional: true, Computed: true, - ValidateFunc: validateMaxLength(2000), + ValidateFunc: validation.StringLenBetween(0, 2000), }, "provider_name": { Type: schema.TypeString, diff --git a/aws/resource_aws_ses_template.go b/aws/resource_aws_ses_template.go index cecf7c28a81..326a6d0a3c6 100644 --- a/aws/resource_aws_ses_template.go +++ b/aws/resource_aws_ses_template.go @@ -31,7 +31,7 @@ func resourceAwsSesTemplate() *schema.Resource { "html": { Type: schema.TypeString, Optional: true, - ValidateFunc: validateMaxLength(512000), + ValidateFunc: validation.StringLenBetween(0, 512000), }, "subject": { Type: schema.TypeString, @@ -40,7 +40,7 @@ func resourceAwsSesTemplate() *schema.Resource { "text": { Type: schema.TypeString, Optional: true, - ValidateFunc: validateMaxLength(512000), + ValidateFunc: validation.StringLenBetween(0, 512000), }, }, } diff --git a/aws/resource_aws_sfn_activity.go b/aws/resource_aws_sfn_activity.go index 9a5e49d8302..9fac3616560 100644 --- a/aws/resource_aws_sfn_activity.go +++ b/aws/resource_aws_sfn_activity.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go/service/sfn" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" + "github.com/hashicorp/terraform/helper/validation" ) func resourceAwsSfnActivity() *schema.Resource { @@ -26,7 +27,7 @@ func resourceAwsSfnActivity() *schema.Resource { Type: schema.TypeString, Required: true, ForceNew: true, - ValidateFunc: validateMaxLength(80), + ValidateFunc: validation.StringLenBetween(0, 80), }, "creation_date": { diff --git a/aws/resource_aws_sfn_state_machine.go b/aws/resource_aws_sfn_state_machine.go index 70d8fd08cc1..4668ff01aab 100644 --- a/aws/resource_aws_sfn_state_machine.go +++ b/aws/resource_aws_sfn_state_machine.go @@ -11,6 +11,7 @@ import ( "github.com/hashicorp/errwrap" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" + "github.com/hashicorp/terraform/helper/validation" ) func resourceAwsSfnStateMachine() *schema.Resource { @@ -27,7 +28,7 @@ func resourceAwsSfnStateMachine() *schema.Resource { "definition": { Type: schema.TypeString, Required: true, - ValidateFunc: validateMaxLength(1024 * 1024), // 1048576 + ValidateFunc: validation.StringLenBetween(0, 1024*1024), // 1048576 }, "name": { diff --git a/aws/resource_aws_waf_rate_based_rule.go b/aws/resource_aws_waf_rate_based_rule.go index 9757fb1adbb..b974e81ad79 100644 --- a/aws/resource_aws_waf_rate_based_rule.go +++ b/aws/resource_aws_waf_rate_based_rule.go @@ -42,7 +42,7 @@ func resourceAwsWafRateBasedRule() *schema.Resource { "data_id": { Type: schema.TypeString, Required: true, - ValidateFunc: validateMaxLength(128), + ValidateFunc: validation.StringLenBetween(0, 128), }, "type": { Type: schema.TypeString, diff --git a/aws/resource_aws_waf_rule.go b/aws/resource_aws_waf_rule.go index b3d7e3c3571..f210138e1f4 100644 --- a/aws/resource_aws_waf_rule.go +++ b/aws/resource_aws_waf_rule.go @@ -8,6 +8,7 @@ import ( "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/service/waf" "github.com/hashicorp/terraform/helper/schema" + "github.com/hashicorp/terraform/helper/validation" ) func resourceAwsWafRule() *schema.Resource { @@ -41,7 +42,7 @@ func resourceAwsWafRule() *schema.Resource { "data_id": { Type: schema.TypeString, Required: true, - ValidateFunc: validateMaxLength(128), + ValidateFunc: validation.StringLenBetween(0, 128), }, "type": { Type: schema.TypeString, diff --git a/aws/resource_aws_wafregional_rate_based_rule.go b/aws/resource_aws_wafregional_rate_based_rule.go index de7c9c072d1..5cfc40f1148 100644 --- a/aws/resource_aws_wafregional_rate_based_rule.go +++ b/aws/resource_aws_wafregional_rate_based_rule.go @@ -42,7 +42,7 @@ func resourceAwsWafRegionalRateBasedRule() *schema.Resource { "data_id": { Type: schema.TypeString, Required: true, - ValidateFunc: validateMaxLength(128), + ValidateFunc: validation.StringLenBetween(0, 128), }, "type": { Type: schema.TypeString, From 6a9a4118f137cdd8476cbb7ed956defaa2d3417e Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Thu, 13 Sep 2018 12:41:08 -0400 Subject: [PATCH 136/184] resource/aws_s3_bucket_inventory: Allow SSE-S3 encryption --- aws/resource_aws_s3_bucket_inventory.go | 9 --------- aws/resource_aws_s3_bucket_inventory_test.go | 2 -- website/docs/r/s3_bucket_inventory.html.markdown | 2 -- 3 files changed, 13 deletions(-) diff --git a/aws/resource_aws_s3_bucket_inventory.go b/aws/resource_aws_s3_bucket_inventory.go index e9b56cbec3b..03cbc43aebd 100644 --- a/aws/resource_aws_s3_bucket_inventory.go +++ b/aws/resource_aws_s3_bucket_inventory.go @@ -1,7 +1,6 @@ package aws import ( - "errors" "fmt" "log" "strings" @@ -329,14 +328,6 @@ func resourceAwsS3BucketInventoryRead(d *schema.ResourceData, meta interface{}) } if output.InventoryConfiguration.Destination != nil { - // Flag the existence of SSE-S3 encryption because it cannot be marshaled when updating a resource. - // Allowing import would risk disabling encryption inadvertently when applying updates. - if output.InventoryConfiguration.Destination.S3BucketDestination.Encryption != nil { - if output.InventoryConfiguration.Destination.S3BucketDestination.Encryption.SSES3 != nil { - return errors.New("sse_s3 encryption is unsupported") - } - } - destination := map[string]interface{}{ "bucket": flattenS3InventoryS3BucketDestination(output.InventoryConfiguration.Destination.S3BucketDestination), } diff --git a/aws/resource_aws_s3_bucket_inventory_test.go b/aws/resource_aws_s3_bucket_inventory_test.go index 99cfeda34f3..2730e92dfc7 100644 --- a/aws/resource_aws_s3_bucket_inventory_test.go +++ b/aws/resource_aws_s3_bucket_inventory_test.go @@ -60,8 +60,6 @@ func TestAccAWSS3BucketInventory_basic(t *testing.T) { } func TestAccAWSS3BucketInventory_encryptWithSSES3(t *testing.T) { - t.Skip("SSE-S3 is not supported by the SDK.") - var conf s3.InventoryConfiguration rString := acctest.RandString(8) resourceName := "aws_s3_bucket_inventory.test" diff --git a/website/docs/r/s3_bucket_inventory.html.markdown b/website/docs/r/s3_bucket_inventory.html.markdown index d0cf64d0321..7fc0f3371f8 100644 --- a/website/docs/r/s3_bucket_inventory.html.markdown +++ b/website/docs/r/s3_bucket_inventory.html.markdown @@ -111,8 +111,6 @@ The `bucket` configuration supports the following: The `encryption` configuration supports the following: -~> **NOTE:** `sse_s3` is currently unsupported. - * `sse_kms` - (Optional) Specifies to use server-side encryption with AWS KMS-managed keys to encrypt the inventory file (documented below). * `sse_s3` - (Optional) Specifies to use server-side encryption with Amazon S3-managed keys (SSE-S3) to encrypt the inventory file. From 1381ffe664b701d47fa72f703ea678e855f27cb1 Mon Sep 17 00:00:00 2001 From: saravanan30erd Date: Thu, 13 Sep 2018 23:45:32 +0400 Subject: [PATCH 137/184] removed validateMaxLength func --- aws/validators.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/aws/validators.go b/aws/validators.go index 6d9b0d9b0cd..e18e230de68 100644 --- a/aws/validators.go +++ b/aws/validators.go @@ -350,10 +350,6 @@ func validateCloudWatchLogResourcePolicyDocument(v interface{}, k string) (ws [] return } -func validateMaxLength(length int) schema.SchemaValidateFunc { - return validation.StringLenBetween(0, length) -} - func validateIntegerInRange(min, max int) schema.SchemaValidateFunc { return func(v interface{}, k string) (ws []string, errors []error) { value := v.(int) From c729400459b2dacafdc717b824625ce36f52b71e Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Thu, 13 Sep 2018 16:08:52 -0400 Subject: [PATCH 138/184] Update CHANGELOG for #5842 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0292b547ed8..1ec23187ad1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,10 @@ ## 1.37.0 (Unreleased) + +BUG FIXES: + +* resource/aws_s3_bucket: Prevent panics with various API read failures [GH-5842] +* resource/aws_s3_bucket: Prevent `NoSuchBucket` error on deletion [GH-5842] + ## 1.36.0 (September 13, 2018) FEATURES: From 4fe2615ee34f82efc12b5cb7229f14661b6db707 Mon Sep 17 00:00:00 2001 From: Guimove Date: Fri, 14 Sep 2018 12:43:36 +0200 Subject: [PATCH 139/184] groupe request per 1600 records --- aws/data_source_aws_autoscaling_groups.go | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/aws/data_source_aws_autoscaling_groups.go b/aws/data_source_aws_autoscaling_groups.go index 92468774746..a3b8bb709fd 100644 --- a/aws/data_source_aws_autoscaling_groups.go +++ b/aws/data_source_aws_autoscaling_groups.go @@ -70,21 +70,26 @@ func dataSourceAwsAutoscalingGroupsRead(d *schema.ResourceData, meta interface{} return !lastPage }) - for _, v := range rawName { - input := &autoscaling.DescribeAutoScalingGroupsInput{ - AutoScalingGroupNames: []*string{ - aws.String(v), - }, + maxAutoScalingGroupNames := 1600 + for i := 0; i < len(rawName); i += maxAutoScalingGroupNames { + end := i + maxAutoScalingGroupNames + + if end > len(rawName) { + end = len(rawName) } - err = conn.DescribeAutoScalingGroupsPages(input, func(resp *autoscaling.DescribeAutoScalingGroupsOutput, lastPage bool) bool { + nameInput := &autoscaling.DescribeAutoScalingGroupsInput{ + AutoScalingGroupNames: aws.StringSlice(rawName[i:end]), + MaxRecords: aws.Int64(100), + } + + err = conn.DescribeAutoScalingGroupsPages(nameInput, func(resp *autoscaling.DescribeAutoScalingGroupsOutput, lastPage bool) bool { for _, group := range resp.AutoScalingGroups { rawArn = append(rawArn, aws.StringValue(group.AutoScalingGroupARN)) } return !lastPage }) } - } else { err = conn.DescribeAutoScalingGroupsPages(&autoscaling.DescribeAutoScalingGroupsInput{}, func(resp *autoscaling.DescribeAutoScalingGroupsOutput, lastPage bool) bool { for _, group := range resp.AutoScalingGroups { From 26ebba6634f937a4731008c91c0a9339e50020cf Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Fri, 14 Sep 2018 08:45:05 -0400 Subject: [PATCH 140/184] Update CHANGELOG for #5870 --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1ec23187ad1..1182d7dfd65 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ ## 1.37.0 (Unreleased) +ENHANCEMENTS: + +* resource/aws_s3_bucket_inventory: Allow SSE-S3 encryption [GH-5870] + BUG FIXES: * resource/aws_s3_bucket: Prevent panics with various API read failures [GH-5842] From 533faa901110851843b28ffa34671e2b77d732bc Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Fri, 14 Sep 2018 08:53:02 -0400 Subject: [PATCH 141/184] Update CHANGELOG for #5852 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1182d7dfd65..df8a9585593 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ ENHANCEMENTS: BUG FIXES: +* resource/aws_config_config_rule: Prevent panic when specifying empty `scope` [GH-5852] * resource/aws_s3_bucket: Prevent panics with various API read failures [GH-5842] * resource/aws_s3_bucket: Prevent `NoSuchBucket` error on deletion [GH-5842] From bd6f634d041b1ad07a5e9711ef56990ad6ba4cde Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Fri, 14 Sep 2018 09:29:48 -0400 Subject: [PATCH 142/184] EKS Getting Started: Updates for new AMI naming and bootstrap.sh --- .../eks-getting-started/eks-worker-nodes.tf | 27 ++++--------------- .../docs/guides/eks-getting-started.html.md | 27 ++++--------------- 2 files changed, 10 insertions(+), 44 deletions(-) diff --git a/examples/eks-getting-started/eks-worker-nodes.tf b/examples/eks-getting-started/eks-worker-nodes.tf index 6b7c0338dd0..f6c140238dd 100644 --- a/examples/eks-getting-started/eks-worker-nodes.tf +++ b/examples/eks-getting-started/eks-worker-nodes.tf @@ -89,7 +89,7 @@ resource "aws_security_group_rule" "demo-node-ingress-cluster" { data "aws_ami" "eks-worker" { filter { name = "name" - values = ["eks-worker-*"] + values = ["amazon-eks-node-v*"] } most_recent = true @@ -100,29 +100,12 @@ data "aws_ami" "eks-worker" { # properly configure Kubernetes applications on the EC2 instance. # We utilize a Terraform local here to simplify Base64 encoding this # information into the AutoScaling Launch Configuration. -# More information: https://amazon-eks.s3-us-west-2.amazonaws.com/1.10.3/2018-06-05/amazon-eks-nodegroup.yaml +# More information: https://docs.aws.amazon.com/eks/latest/userguide/launch-workers.html locals { demo-node-userdata = < $CA_CERTIFICATE_FILE_PATH -INTERNAL_IP=$(curl -s http://169.254.169.254/latest/meta-data/local-ipv4) -sed -i s,MASTER_ENDPOINT,${aws_eks_cluster.demo.endpoint},g /var/lib/kubelet/kubeconfig -sed -i s,CLUSTER_NAME,${var.cluster-name},g /var/lib/kubelet/kubeconfig -sed -i s,REGION,${data.aws_region.current.name},g /etc/systemd/system/kubelet.service -sed -i s,MAX_PODS,20,g /etc/systemd/system/kubelet.service -sed -i s,MASTER_ENDPOINT,${aws_eks_cluster.demo.endpoint},g /etc/systemd/system/kubelet.service -sed -i s,INTERNAL_IP,$INTERNAL_IP,g /etc/systemd/system/kubelet.service -DNS_CLUSTER_IP=10.100.0.10 -if [[ $INTERNAL_IP == 10.* ]] ; then DNS_CLUSTER_IP=172.20.0.10; fi -sed -i s,DNS_CLUSTER_IP,$DNS_CLUSTER_IP,g /etc/systemd/system/kubelet.service -sed -i s,CERTIFICATE_AUTHORITY_FILE,$CA_CERTIFICATE_FILE_PATH,g /var/lib/kubelet/kubeconfig -sed -i s,CLIENT_CA_FILE,$CA_CERTIFICATE_FILE_PATH,g /etc/systemd/system/kubelet.service -systemctl daemon-reload -systemctl restart kubelet +#!/bin/bash +set -o xtrace +/etc/eks/bootstrap.sh --apiserver-endpoint '${aws_eks_cluster.demo.endpoint}' --b64-cluster-ca '${aws_eks_cluster.demo.certificate_authority.0.data}' '${var.cluster-name}' USERDATA } diff --git a/website/docs/guides/eks-getting-started.html.md b/website/docs/guides/eks-getting-started.html.md index 3a946e24c34..0aa6a494a59 100644 --- a/website/docs/guides/eks-getting-started.html.md +++ b/website/docs/guides/eks-getting-started.html.md @@ -466,7 +466,7 @@ First, let us create a data source to fetch the latest Amazon Machine Image data "aws_ami" "eks-worker" { filter { name = "name" - values = ["eks-worker-*"] + values = ["amazon-eks-node-v*"] } most_recent = true @@ -486,29 +486,12 @@ data "aws_region" "current" {} # properly configure Kubernetes applications on the EC2 instance. # We utilize a Terraform local here to simplify Base64 encoding this # information into the AutoScaling Launch Configuration. -# More information: https://amazon-eks.s3-us-west-2.amazonaws.com/1.10.3/2018-06-05/amazon-eks-nodegroup.yaml +# More information: https://docs.aws.amazon.com/eks/latest/userguide/launch-workers.html locals { demo-node-userdata = < $CA_CERTIFICATE_FILE_PATH -INTERNAL_IP=$(curl -s http://169.254.169.254/latest/meta-data/local-ipv4) -sed -i s,MASTER_ENDPOINT,${aws_eks_cluster.demo.endpoint},g /var/lib/kubelet/kubeconfig -sed -i s,CLUSTER_NAME,${var.cluster-name},g /var/lib/kubelet/kubeconfig -sed -i s,REGION,${data.aws_region.current.name},g /etc/systemd/system/kubelet.service -sed -i s,MAX_PODS,20,g /etc/systemd/system/kubelet.service -sed -i s,MASTER_ENDPOINT,${aws_eks_cluster.demo.endpoint},g /etc/systemd/system/kubelet.service -sed -i s,INTERNAL_IP,$INTERNAL_IP,g /etc/systemd/system/kubelet.service -DNS_CLUSTER_IP=10.100.0.10 -if [[ $INTERNAL_IP == 10.* ]] ; then DNS_CLUSTER_IP=172.20.0.10; fi -sed -i s,DNS_CLUSTER_IP,$DNS_CLUSTER_IP,g /etc/systemd/system/kubelet.service -sed -i s,CERTIFICATE_AUTHORITY_FILE,$CA_CERTIFICATE_FILE_PATH,g /var/lib/kubelet/kubeconfig -sed -i s,CLIENT_CA_FILE,$CA_CERTIFICATE_FILE_PATH,g /etc/systemd/system/kubelet.service -systemctl daemon-reload -systemctl restart kubelet +#!/bin/bash +set -o xtrace +/etc/eks/bootstrap.sh --apiserver-endpoint '${aws_eks_cluster.demo.endpoint}' --b64-cluster-ca '${aws_eks_cluster.demo.certificate_authority.0.data}' '${var.cluster-name}' USERDATA } From 563770ec399e94f325aa52d9d0a3fd19b693bb04 Mon Sep 17 00:00:00 2001 From: Kash Date: Fri, 14 Sep 2018 10:57:17 -0400 Subject: [PATCH 143/184] fix setting ipv6_addresses --- aws/resource_aws_launch_template.go | 19 ++++++++----- aws/resource_aws_launch_template_test.go | 34 ++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 6 deletions(-) diff --git a/aws/resource_aws_launch_template.go b/aws/resource_aws_launch_template.go index 5be358d0b58..92a2afda31b 100644 --- a/aws/resource_aws_launch_template.go +++ b/aws/resource_aws_launch_template.go @@ -758,7 +758,6 @@ func getMonitoring(m *ec2.LaunchTemplatesMonitoring) []interface{} { func getNetworkInterfaces(n []*ec2.LaunchTemplateInstanceNetworkInterfaceSpecification) []interface{} { s := []interface{}{} for _, v := range n { - var ipv6Addresses []string var ipv4Addresses []string networkInterface := map[string]interface{}{ @@ -773,11 +772,19 @@ func getNetworkInterfaces(n []*ec2.LaunchTemplateInstanceNetworkInterfaceSpecifi "subnet_id": aws.StringValue(v.SubnetId), } - for _, address := range v.Ipv6Addresses { - ipv6Addresses = append(ipv6Addresses, aws.StringValue(address.Ipv6Address)) - } - if len(ipv6Addresses) > 0 { - networkInterface["ipv6_addresses"] = ipv6Addresses + if len(v.Ipv6Addresses) > 0 { + raw, ok := networkInterface["ipv6_addresses"] + if !ok { + raw = schema.NewSet(schema.HashString, nil) + } + + list := raw.(*schema.Set) + + for _, address := range v.Ipv6Addresses { + list.Add(aws.StringValue(address.Ipv6Address)) + } + + networkInterface["ipv6_addresses"] = list } for _, address := range v.PrivateIpAddresses { diff --git a/aws/resource_aws_launch_template_test.go b/aws/resource_aws_launch_template_test.go index e53c527d20b..f1a99eae79c 100644 --- a/aws/resource_aws_launch_template_test.go +++ b/aws/resource_aws_launch_template_test.go @@ -250,6 +250,27 @@ func TestAccAWSLaunchTemplate_networkInterface(t *testing.T) { }) } +func TestAccAWSLaunchTemplate_networkInterface_ipv6Addresses(t *testing.T) { + var template ec2.LaunchTemplate + resName := "aws_launch_template.test" + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSLaunchTemplateDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSLaunchTemplateConfig_networkInterface_ipv6Addresses, + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSLaunchTemplateExists(resName, &template), + resource.TestCheckResourceAttr(resName, "network_interfaces.#", "1"), + resource.TestCheckResourceAttr(resName, "network_interfaces.0.ipv6_addresses.#", "2"), + ), + }, + }, + }) +} + func testAccCheckAWSLaunchTemplateExists(n string, t *ec2.LaunchTemplate) resource.TestCheckFunc { return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[n] @@ -531,6 +552,19 @@ resource "aws_launch_template" "test" { } ` +const testAccAWSLaunchTemplateConfig_networkInterface_ipv6Addresses = ` +resource "aws_launch_template" "test" { + name = "network-interface-ipv6-addresses-launch-template" + + network_interfaces { + ipv6_addresses = [ + "0:0:0:0:0:ffff:a01:5", + "0:0:0:0:0:ffff:a01:6", + ] + } +} +` + const testAccAWSLaunchTemplateConfig_asg_basic = ` data "aws_ami" "test_ami" { most_recent = true From fda7f321a8cc825c5cebbef24127c12e67839e7b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 14 Sep 2018 11:40:01 -0400 Subject: [PATCH 144/184] Complete 'aws_dx_bgp_peer' resource. --- aws/resource_aws_dx_bgp_peer.go | 73 ++++++++++++++------ aws/resource_aws_dx_bgp_peer_test.go | 84 ++++++++++++++++++++++++ website/docs/r/dx_bgp_peer.html.markdown | 1 + 3 files changed, 138 insertions(+), 20 deletions(-) create mode 100644 aws/resource_aws_dx_bgp_peer_test.go diff --git a/aws/resource_aws_dx_bgp_peer.go b/aws/resource_aws_dx_bgp_peer.go index a3e0ec2be07..0770e3508ac 100644 --- a/aws/resource_aws_dx_bgp_peer.go +++ b/aws/resource_aws_dx_bgp_peer.go @@ -13,10 +13,9 @@ import ( func resourceAwsDxBgpPeer() *schema.Resource { return &schema.Resource{ - Create: resourceAwsDxBgpPeerCreate, - Read: resourceAwsDxBgpPeerRead, - Delete: resourceAwsDxBgpPeerDelete, - CustomizeDiff: resourceAwsDxBgpPeerCustomizeDiff, + Create: resourceAwsDxBgpPeerCreate, + Read: resourceAwsDxBgpPeerRead, + Delete: resourceAwsDxBgpPeerDelete, Schema: map[string]*schema.Schema{ "address_family": { @@ -53,6 +52,10 @@ func resourceAwsDxBgpPeer() *schema.Resource { Computed: true, ForceNew: true, }, + "bgp_status": { + Type: schema.TypeString, + Computed: true, + }, }, Timeouts: &schema.ResourceTimeout{ @@ -90,32 +93,62 @@ func resourceAwsDxBgpPeerCreate(d *schema.ResourceData, meta interface{}) error d.SetId(fmt.Sprintf("%s-%s-%d", d.Get("virtual_interface_id"), d.Get("address_family"), d.Get("bgp_asn"))) - // if err := dxPublicVirtualInterfaceWaitUntilAvailable(d, conn); err != nil { - // return err - // } - return resourceAwsDxBgpPeerRead(d, meta) } func resourceAwsDxBgpPeerRead(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).dxconn + + vifId := d.Get("virtual_interface_id").(string) + vif, err := dxVirtualInterfaceRead(vifId, conn) + if err != nil { + return err + } + if vif == nil { + log.Printf("[WARN] Direct Connect virtual interface (%s) not found, removing BGP peer from state", vifId) + d.SetId("") + return nil + } + + var bgpPeer *directconnect.BGPPeer + for _, peer := range vif.BgpPeers { + if aws.StringValue(peer.AddressFamily) == d.Get("address_family").(string) && + aws.Int64Value(peer.Asn) == int64(d.Get("bgp_asn").(int)) { + bgpPeer = peer + break + } + } + if bgpPeer == nil { + log.Printf("[WARN] Direct Connect BGP peer (%s) not found, removing from state", d.Id()) + d.SetId("") + return nil + } + + d.Set("address_family", bgpPeer.AddressFamily) + d.Set("bgp_asn", bgpPeer.Asn) + d.Set("virtual_interface_id", vif.VirtualInterfaceId) + d.Set("amazon_address", bgpPeer.AmazonAddress) + d.Set("bgp_auth_key", bgpPeer.AuthKey) + d.Set("customer_address", bgpPeer.CustomerAddress) + d.Set("bgp_status", bgpPeer.BgpStatus) + return nil } func resourceAwsDxBgpPeerDelete(d *schema.ResourceData, meta interface{}) error { - return nil -} + conn := meta.(*AWSClient).dxconn -func resourceAwsDxBgpPeerCustomizeDiff(diff *schema.ResourceDiff, meta interface{}) error { - if diff.Id() == "" { - // New resource. - if addressFamily := diff.Get("address_family").(string); addressFamily == directconnect.AddressFamilyIpv4 { - if _, ok := diff.GetOk("customer_address"); !ok { - return fmt.Errorf("'customer_address' must be set when 'address_family' is '%s'", addressFamily) - } - if _, ok := diff.GetOk("amazon_address"); !ok { - return fmt.Errorf("'amazon_address' must be set when 'address_family' is '%s'", addressFamily) - } + log.Printf("[DEBUG] Deleting Direct Connect BGP peer: %s", d.Id()) + _, err := conn.DeleteBGPPeer(&directconnect.DeleteBGPPeerInput{ + Asn: aws.Int64(int64(d.Get("bgp_asn").(int))), + CustomerAddress: aws.String(d.Get("customer_address").(string)), + VirtualInterfaceId: aws.String(d.Get("virtual_interface_id").(string)), + }) + if err != nil { + if isAWSErr(err, "DirectConnectClientException", "XXX") { + return nil } + return err } return nil diff --git a/aws/resource_aws_dx_bgp_peer_test.go b/aws/resource_aws_dx_bgp_peer_test.go new file mode 100644 index 00000000000..6ff20034e0c --- /dev/null +++ b/aws/resource_aws_dx_bgp_peer_test.go @@ -0,0 +1,84 @@ +package aws + +import ( + "fmt" + "os" + "strconv" + "testing" + + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/directconnect" + "github.com/hashicorp/terraform/helper/resource" + "github.com/hashicorp/terraform/terraform" +) + +func TestAccAwsDxBgpPeer_basic(t *testing.T) { + key := "DX_VIRTUAL_INTERFACE_ID" + vifId := os.Getenv(key) + if vifId == "" { + t.Skipf("Environment variable %s is not set", key) + } + bgpAsn := randIntRange(64512, 65534) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAwsDxBgpPeerDestroy, + Steps: []resource.TestStep{ + { + Config: testAccDxBgpPeerConfig(vifId, bgpAsn), + Check: resource.ComposeTestCheckFunc( + testAccCheckAwsDxBgpPeerExists("aws_dx_bgp_peer.foo"), + resource.TestCheckResourceAttr("aws_dx_bgp_peer.foo", "address_family", "ipv6"), + ), + }, + }, + }) +} + +func testAccCheckAwsDxBgpPeerDestroy(s *terraform.State) error { + conn := testAccProvider.Meta().(*AWSClient).dxconn + + for _, rs := range s.RootModule().Resources { + if rs.Type != "aws_dx_bgp_peer" { + continue + } + input := &directconnect.DescribeVirtualInterfacesInput{ + VirtualInterfaceId: aws.String(rs.Primary.Attributes["virtual_interface_id"]), + } + + resp, err := conn.DescribeVirtualInterfaces(input) + if err != nil { + return err + } + for _, peer := range resp.VirtualInterfaces[0].BgpPeers { + if *peer.AddressFamily == rs.Primary.Attributes["address_family"] && + strconv.Itoa(int(*peer.Asn)) == rs.Primary.Attributes["bgp_asn"] { + return fmt.Errorf("[DESTROY ERROR] Dx BGP peer (%s) not deleted", rs.Primary.ID) + } + } + } + return nil +} + +func testAccCheckAwsDxBgpPeerExists(name string) resource.TestCheckFunc { + return func(s *terraform.State) error { + _, ok := s.RootModule().Resources[name] + if !ok { + return fmt.Errorf("Not found: %s", name) + } + + return nil + } +} + +func testAccDxBgpPeerConfig(vifId string, bgpAsn int) string { + return fmt.Sprintf(` +resource "aws_dx_bgp_peer" "foo" { + virtual_interface_id = "%s" + + address_family = "ipv6" + bgp_asn = %d +} +`, vifId, bgpAsn) +} diff --git a/website/docs/r/dx_bgp_peer.html.markdown b/website/docs/r/dx_bgp_peer.html.markdown index ecb3a8576ee..9079386d738 100644 --- a/website/docs/r/dx_bgp_peer.html.markdown +++ b/website/docs/r/dx_bgp_peer.html.markdown @@ -38,6 +38,7 @@ Required for IPv4 BGP peers on public virtual interfaces. In addition to all arguments above, the following attributes are exported: * `id` - The ID of the BGP peer. +* `bgp_status` - The Up/Down state of the BGP peer. ## Timeouts From d149602720f1920358dfcfca16c4c09726755541 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Fri, 14 Sep 2018 12:49:04 -0400 Subject: [PATCH 145/184] resource/aws_iam_policy: Ensure description is properly read during creation This resource was previously not following best practices of calling the read function after creation. Now it will read back information from the API, which tangentally fixes the description not being available in the CreatePolicy response. Changes: * Create separate acceptance tests for all arguments * Call read function after create and update functions * Create `testAccCheckResourceAttrGlobalARN` for checking global ARN attributes * Remove extraneous aws/import_aws_iam_policy_test.go Previously (before code updates): ``` === RUN TestAccAWSIAMPolicy_basic --- PASS: TestAccAWSIAMPolicy_basic (10.15s) === RUN TestAccAWSIAMPolicy_description --- FAIL: TestAccAWSIAMPolicy_description (5.06s) testing.go:527: Step 0 error: Check failed: Check 2/2 error: aws_iam_policy.test: Attribute 'description' expected "description1", got "" === RUN TestAccAWSIAMPolicy_namePrefix --- PASS: TestAccAWSIAMPolicy_namePrefix (9.72s) === RUN TestAccAWSIAMPolicy_path --- PASS: TestAccAWSIAMPolicy_path (9.85s) === RUN TestAccAWSIAMPolicy_policy --- PASS: TestAccAWSIAMPolicy_policy (13.49s) ``` Now: ``` === RUN TestAccAWSIAMPolicy_basic --- PASS: TestAccAWSIAMPolicy_basic (10.29s) === RUN TestAccAWSIAMPolicy_description --- PASS: TestAccAWSIAMPolicy_description (8.00s) === RUN TestAccAWSIAMPolicy_namePrefix --- PASS: TestAccAWSIAMPolicy_namePrefix (9.15s) === RUN TestAccAWSIAMPolicy_path --- PASS: TestAccAWSIAMPolicy_path (9.25s) === RUN TestAccAWSIAMPolicy_policy --- PASS: TestAccAWSIAMPolicy_policy (15.21s) ``` --- aws/import_aws_iam_policy_test.go | 88 ---------- aws/provider_test.go | 13 ++ aws/resource_aws_iam_policy.go | 123 +++++++++----- aws/resource_aws_iam_policy_test.go | 254 +++++++++++++++++++++------- 4 files changed, 286 insertions(+), 192 deletions(-) delete mode 100644 aws/import_aws_iam_policy_test.go diff --git a/aws/import_aws_iam_policy_test.go b/aws/import_aws_iam_policy_test.go deleted file mode 100644 index 2dbd553bda7..00000000000 --- a/aws/import_aws_iam_policy_test.go +++ /dev/null @@ -1,88 +0,0 @@ -package aws - -import ( - "fmt" - "testing" - - "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/aws/awserr" - "github.com/aws/aws-sdk-go/service/iam" - - "github.com/hashicorp/terraform/helper/resource" - "github.com/hashicorp/terraform/terraform" -) - -func testAccAwsIamPolicyConfig(suffix string) string { - return fmt.Sprintf(` -resource "aws_iam_policy" "test_%[1]s" { - name = "test_policy_%[1]s" - path = "/" - description = "My test policy" - policy = < Date: Fri, 14 Sep 2018 12:57:18 -0400 Subject: [PATCH 146/184] Add BGP peer state change functions. --- aws/resource_aws_dx_bgp_peer.go | 106 ++++++++++++++++++++++++-------- 1 file changed, 80 insertions(+), 26 deletions(-) diff --git a/aws/resource_aws_dx_bgp_peer.go b/aws/resource_aws_dx_bgp_peer.go index 0770e3508ac..f9800369068 100644 --- a/aws/resource_aws_dx_bgp_peer.go +++ b/aws/resource_aws_dx_bgp_peer.go @@ -7,6 +7,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/directconnect" + "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/validation" ) @@ -68,11 +69,15 @@ func resourceAwsDxBgpPeer() *schema.Resource { func resourceAwsDxBgpPeerCreate(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).dxconn + vifId := d.Get("virtual_interface_id").(string) + addrFamily := d.Get("address_family").(string) + asn := int64(d.Get("bgp_asn").(int)) + req := &directconnect.CreateBGPPeerInput{ - VirtualInterfaceId: aws.String(d.Get("virtual_interface_id").(string)), + VirtualInterfaceId: aws.String(vifId), NewBGPPeer: &directconnect.NewBGPPeer{ - AddressFamily: aws.String(d.Get("address_family").(string)), - Asn: aws.Int64(int64(d.Get("bgp_asn").(int))), + AddressFamily: aws.String(addrFamily), + Asn: aws.Int64(asn), }, } if v, ok := d.GetOk("amazon_address"); ok && v.(string) != "" { @@ -91,7 +96,25 @@ func resourceAwsDxBgpPeerCreate(d *schema.ResourceData, meta interface{}) error return fmt.Errorf("Error creating Direct Connect BGP peer: %s", err) } - d.SetId(fmt.Sprintf("%s-%s-%d", d.Get("virtual_interface_id"), d.Get("address_family"), d.Get("bgp_asn"))) + d.SetId(fmt.Sprintf("%s-%s-%d", vifId, addrFamily, asn)) + + stateConf := &resource.StateChangeConf{ + Pending: []string{ + directconnect.BGPPeerStatePending, + }, + Target: []string{ + directconnect.BGPPeerStateAvailable, + directconnect.BGPPeerStateVerifying, + }, + Refresh: dxBgpPeerStateRefresh(conn, vifId, addrFamily, asn), + Timeout: d.Timeout(schema.TimeoutDelete), + Delay: 10 * time.Second, + MinTimeout: 5 * time.Second, + } + _, err = stateConf.WaitForState() + if err != nil { + return fmt.Errorf("Error waiting for Direct Connect BGP peer (%s) to be available: %s", d.Id(), err) + } return resourceAwsDxBgpPeerRead(d, meta) } @@ -100,33 +123,20 @@ func resourceAwsDxBgpPeerRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).dxconn vifId := d.Get("virtual_interface_id").(string) - vif, err := dxVirtualInterfaceRead(vifId, conn) - if err != nil { - return err - } - if vif == nil { - log.Printf("[WARN] Direct Connect virtual interface (%s) not found, removing BGP peer from state", vifId) - d.SetId("") - return nil - } + addrFamily := d.Get("address_family").(string) + asn := int64(d.Get("bgp_asn").(int)) - var bgpPeer *directconnect.BGPPeer - for _, peer := range vif.BgpPeers { - if aws.StringValue(peer.AddressFamily) == d.Get("address_family").(string) && - aws.Int64Value(peer.Asn) == int64(d.Get("bgp_asn").(int)) { - bgpPeer = peer - break - } + bgpPeerRaw, state, err := dxBgpPeerStateRefresh(conn, vifId, addrFamily, asn)() + if err != nil { + return fmt.Errorf("Error reading Direct Connect BGP peer: %s", err) } - if bgpPeer == nil { + if state == directconnect.BGPPeerStateDeleted { log.Printf("[WARN] Direct Connect BGP peer (%s) not found, removing from state", d.Id()) d.SetId("") return nil } - d.Set("address_family", bgpPeer.AddressFamily) - d.Set("bgp_asn", bgpPeer.Asn) - d.Set("virtual_interface_id", vif.VirtualInterfaceId) + bgpPeer := bgpPeerRaw.(*directconnect.BGPPeer) d.Set("amazon_address", bgpPeer.AmazonAddress) d.Set("bgp_auth_key", bgpPeer.AuthKey) d.Set("customer_address", bgpPeer.CustomerAddress) @@ -138,11 +148,15 @@ func resourceAwsDxBgpPeerRead(d *schema.ResourceData, meta interface{}) error { func resourceAwsDxBgpPeerDelete(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).dxconn + vifId := d.Get("virtual_interface_id").(string) + addrFamily := d.Get("address_family").(string) + asn := int64(d.Get("bgp_asn").(int)) + log.Printf("[DEBUG] Deleting Direct Connect BGP peer: %s", d.Id()) _, err := conn.DeleteBGPPeer(&directconnect.DeleteBGPPeerInput{ - Asn: aws.Int64(int64(d.Get("bgp_asn").(int))), + Asn: aws.Int64(asn), CustomerAddress: aws.String(d.Get("customer_address").(string)), - VirtualInterfaceId: aws.String(d.Get("virtual_interface_id").(string)), + VirtualInterfaceId: aws.String(vifId), }) if err != nil { if isAWSErr(err, "DirectConnectClientException", "XXX") { @@ -151,5 +165,45 @@ func resourceAwsDxBgpPeerDelete(d *schema.ResourceData, meta interface{}) error return err } + stateConf := &resource.StateChangeConf{ + Pending: []string{ + directconnect.BGPPeerStateAvailable, + directconnect.BGPPeerStateDeleting, + directconnect.BGPPeerStatePending, + directconnect.BGPPeerStateVerifying, + }, + Target: []string{ + directconnect.BGPPeerStateDeleted, + }, + Refresh: dxBgpPeerStateRefresh(conn, vifId, addrFamily, asn), + Timeout: d.Timeout(schema.TimeoutDelete), + Delay: 10 * time.Second, + MinTimeout: 5 * time.Second, + } + _, err = stateConf.WaitForState() + if err != nil { + return fmt.Errorf("Error waiting for Direct Connect BGP peer (%s) to be deleted: %s", d.Id(), err) + } + return nil } + +func dxBgpPeerStateRefresh(conn *directconnect.DirectConnect, vifId, addrFamily string, asn int64) resource.StateRefreshFunc { + return func() (interface{}, string, error) { + vif, err := dxVirtualInterfaceRead(vifId, conn) + if err != nil { + return nil, "", err + } + if vif == nil { + return "", directconnect.BGPPeerStateDeleted, nil + } + + for _, bgpPeer := range vif.BgpPeers { + if aws.StringValue(bgpPeer.AddressFamily) == addrFamily && aws.Int64Value(bgpPeer.Asn) == asn { + return bgpPeer, aws.StringValue(bgpPeer.BgpPeerState), nil + } + } + + return "", directconnect.BGPPeerStateDeleted, nil + } +} From 114ec23016e33f11c6c48564436f80bd923b339d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 14 Sep 2018 13:24:49 -0400 Subject: [PATCH 147/184] Correct error message for when the BGP peering has already gone. --- aws/resource_aws_dx_bgp_peer.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/aws/resource_aws_dx_bgp_peer.go b/aws/resource_aws_dx_bgp_peer.go index f9800369068..faed5acc58c 100644 --- a/aws/resource_aws_dx_bgp_peer.go +++ b/aws/resource_aws_dx_bgp_peer.go @@ -159,7 +159,8 @@ func resourceAwsDxBgpPeerDelete(d *schema.ResourceData, meta interface{}) error VirtualInterfaceId: aws.String(vifId), }) if err != nil { - if isAWSErr(err, "DirectConnectClientException", "XXX") { + // This is the error returned if the BGP peering has already gone. + if isAWSErr(err, "DirectConnectClientException", "The last BGP Peer on a Virtual Interface cannot be deleted") { return nil } return err From 654663a551f501bb282433256a27bca6398d19ff Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 14 Sep 2018 13:50:45 -0400 Subject: [PATCH 148/184] Fix BGP peer acceptance test. --- aws/resource_aws_dx_bgp_peer_test.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/aws/resource_aws_dx_bgp_peer_test.go b/aws/resource_aws_dx_bgp_peer_test.go index 6ff20034e0c..f1921f092a7 100644 --- a/aws/resource_aws_dx_bgp_peer_test.go +++ b/aws/resource_aws_dx_bgp_peer_test.go @@ -53,7 +53,8 @@ func testAccCheckAwsDxBgpPeerDestroy(s *terraform.State) error { } for _, peer := range resp.VirtualInterfaces[0].BgpPeers { if *peer.AddressFamily == rs.Primary.Attributes["address_family"] && - strconv.Itoa(int(*peer.Asn)) == rs.Primary.Attributes["bgp_asn"] { + strconv.Itoa(int(*peer.Asn)) == rs.Primary.Attributes["bgp_asn"] && + *peer.BgpPeerState != directconnect.BGPPeerStateDeleted { return fmt.Errorf("[DESTROY ERROR] Dx BGP peer (%s) not deleted", rs.Primary.ID) } } From f4527408ddba87b53df4ec21c55350b97d7675c7 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Fri, 14 Sep 2018 13:56:24 -0400 Subject: [PATCH 149/184] Update CHANGELOG for #5884 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index df8a9585593..fd1502f8983 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ ENHANCEMENTS: BUG FIXES: * resource/aws_config_config_rule: Prevent panic when specifying empty `scope` [GH-5852] +* resource/aws_iam_policy: Ensure `description` is properly read into Terraform state during resource creation [GH-5884] * resource/aws_s3_bucket: Prevent panics with various API read failures [GH-5842] * resource/aws_s3_bucket: Prevent `NoSuchBucket` error on deletion [GH-5842] From e7a191e1e813e86a804146b1397b3b0ddc4e7f35 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Fri, 14 Sep 2018 14:36:07 -0400 Subject: [PATCH 150/184] Update CHANGELOG for #5886 --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index fd1502f8983..ce6ac8bfa8c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ ## 1.37.0 (Unreleased) +FEATURES: + +* **New Resource:** `aws_dx_bgp_peer` [GH-5886] + ENHANCEMENTS: * resource/aws_s3_bucket_inventory: Allow SSE-S3 encryption [GH-5870] From 796281c735fba34b7b40f7bfc6e3c37ef9648ab0 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Fri, 14 Sep 2018 15:56:28 -0400 Subject: [PATCH 151/184] provider: Remove errwrap usage and [LEVEL] in error messaging Changes: * Replace `errwrap.Wrapf()` usage with `fmt.Errorf()` * Fix fmt.Errorf(fmt.Sprintf()) usage * Fix other `goimports` issues (since the errwrap removal was causing some new ones) * Remove `[LEVEL]` from error messaging (e.g. `[ERROR] Actual message`) ``` $ make lint ==> Checking source code against linters... $ make test TEST=./aws ==> Checking that code complies with gofmt requirements... go test ./aws -timeout=30s -parallel=4 ok github.com/terraform-providers/terraform-provider-aws/aws 2.559s ``` --- aws/config.go | 3 +-- aws/data_source_aws_autoscaling_groups.go | 2 +- aws/data_source_aws_availability_zones.go | 2 +- aws/data_source_aws_cloudformation_stack.go | 3 +-- aws/data_source_aws_db_instance.go | 8 +++---- aws/data_source_aws_efs_file_system.go | 3 +-- aws/data_source_aws_efs_file_system_test.go | 2 +- aws/data_source_aws_efs_mount_target.go | 5 ++-- aws/data_source_aws_iam_group.go | 3 +-- aws/data_source_aws_iam_instance_profile.go | 3 +-- aws/data_source_aws_iam_server_certificate.go | 3 +-- aws/data_source_aws_kms_alias.go | 5 ++-- aws/data_source_aws_kms_key.go | 3 ++- aws/data_source_aws_kms_key_test.go | 2 +- aws/data_source_aws_lb_listener.go | 2 +- aws/data_source_aws_redshift_cluster.go | 6 ++--- aws/data_source_aws_security_groups_test.go | 3 ++- aws/data_source_aws_sns.go | 3 +-- aws/data_source_aws_ssm_parameter.go | 3 +-- aws/data_source_aws_subnet_test.go | 2 +- aws/import_aws_s3_bucket.go | 5 ++-- aws/import_aws_security_group.go | 3 +-- aws/resource_aws_api_gateway_usage_plan.go | 8 +++---- aws/resource_aws_api_gateway_vpc_link.go | 4 ++-- aws/resource_aws_athena_database.go | 6 ++--- aws/resource_aws_autoscaling_attachment.go | 9 ++++---- aws/resource_aws_autoscaling_group.go | 15 ++++++------ aws/resource_aws_autoscaling_group_waiting.go | 4 +--- ...resource_aws_autoscaling_lifecycle_hook.go | 10 ++++---- aws/resource_aws_autoscaling_notification.go | 4 ++-- aws/resource_aws_batch_job_queue.go | 4 ++-- aws/resource_aws_cloudformation_stack.go | 11 ++++----- aws/resource_aws_cloudfront_distribution.go | 7 +++--- aws/resource_aws_cloudwatch_event_rule.go | 13 +++++------ aws/resource_aws_cloudwatch_event_target.go | 12 +++++----- aws/resource_aws_cloudwatch_log_stream.go | 5 ++-- ..._aws_cloudwatch_log_subscription_filter.go | 2 +- aws/resource_aws_codebuild_project.go | 4 ++-- ...source_aws_codedeploy_deployment_config.go | 2 +- aws/resource_aws_codepipeline.go | 6 ++--- aws/resource_aws_cognito_identity_pool.go | 8 +++---- ..._cognito_identity_pool_roles_attachment.go | 4 ++-- aws/resource_aws_cognito_user_pool.go | 7 +++--- aws/resource_aws_cognito_user_pool_client.go | 9 ++++---- aws/resource_aws_customer_gateway.go | 8 +++---- aws/resource_aws_dax_cluster.go | 10 ++++---- aws/resource_aws_db_instance.go | 2 +- aws/resource_aws_default_network_acl.go | 2 +- aws/resource_aws_default_security_group.go | 7 +++--- aws/resource_aws_dms_replication_task.go | 4 ++-- aws/resource_aws_dx_connection.go | 4 ++-- aws/resource_aws_dx_lag.go | 4 ++-- aws/resource_aws_dynamodb_table_item_test.go | 2 +- aws/resource_aws_dynamodb_table_migrate.go | 2 +- aws/resource_aws_dynamodb_table_test.go | 10 ++++---- aws/resource_aws_ebs_volume.go | 5 ++-- aws/resource_aws_ecs_service.go | 6 ++--- ...source_aws_egress_only_internet_gateway.go | 3 +-- ...ource_aws_elastic_beanstalk_environment.go | 6 ++--- ...esource_aws_elastic_transcoder_pipeline.go | 2 +- aws/resource_aws_elasticache_cluster.go | 6 ++--- ...ource_aws_elasticache_replication_group.go | 4 ++-- aws/resource_aws_elasticsearch_domain.go | 3 +-- aws/resource_aws_elb.go | 4 ++-- aws/resource_aws_emr_cluster.go | 8 +++---- aws/resource_aws_emr_cluster_test.go | 2 +- aws/resource_aws_emr_instance_group.go | 6 ++--- aws/resource_aws_flow_log.go | 2 +- aws/resource_aws_glacier_vault.go | 3 +-- aws/resource_aws_guardduty_ipset.go | 4 ++-- aws/resource_aws_guardduty_threatintelset.go | 4 ++-- aws/resource_aws_iam_access_key.go | 2 +- aws/resource_aws_iam_group_membership.go | 2 +- ...esource_aws_iam_group_policy_attachment.go | 4 ++-- aws/resource_aws_iam_policy_attachment.go | 2 +- ...resource_aws_iam_role_policy_attachment.go | 4 ++-- aws/resource_aws_iam_server_certificate.go | 8 +++---- aws/resource_aws_iam_user_group_membership.go | 2 +- aws/resource_aws_iam_user_login_profile.go | 3 +-- ...resource_aws_iam_user_policy_attachment.go | 4 ++-- aws/resource_aws_instance.go | 6 ++--- aws/resource_aws_internet_gateway.go | 3 +-- aws/resource_aws_iot_policy_test.go | 2 +- ...ce_aws_kinesis_firehose_delivery_stream.go | 12 +++++----- aws/resource_aws_kinesis_stream.go | 2 +- aws/resource_aws_kms_grant.go | 6 ++--- aws/resource_aws_kms_key.go | 5 ++-- aws/resource_aws_lambda_function.go | 2 +- aws/resource_aws_lambda_permission.go | 6 ++--- aws/resource_aws_lightsail_instance.go | 4 ++-- aws/resource_aws_lightsail_key_pair.go | 4 ++-- aws/resource_aws_neptune_cluster.go | 2 +- aws/resource_aws_network_acl.go | 2 +- aws/resource_aws_opsworks_instance.go | 4 ++-- aws/resource_aws_opsworks_stack.go | 3 +-- aws/resource_aws_rds_cluster.go | 4 ++-- aws/resource_aws_rds_cluster_instance.go | 4 ++-- aws/resource_aws_redshift_cluster.go | 16 ++++++------- aws/resource_aws_redshift_subnet_group.go | 2 +- aws/resource_aws_route53_record.go | 23 +++++++++---------- aws/resource_aws_route53_zone.go | 9 ++++---- aws/resource_aws_s3_bucket.go | 5 ++-- aws/resource_aws_security_group_rule.go | 3 +-- ...esource_aws_security_group_rule_migrate.go | 2 +- aws/resource_aws_sfn_activity_test.go | 2 +- aws/resource_aws_sfn_state_machine.go | 3 +-- ...resource_aws_spot_datafeed_subscription.go | 8 +++---- aws/resource_aws_spot_fleet_request.go | 2 +- aws/resource_aws_spot_instance_request.go | 2 +- aws/resource_aws_sqs_queue.go | 2 +- aws/resource_aws_ssm_activation.go | 11 ++++----- aws/resource_aws_ssm_association.go | 16 ++++++------- aws/resource_aws_ssm_document.go | 17 +++++++------- ...ource_aws_ssm_maintenance_window_target.go | 2 +- ...esource_aws_ssm_maintenance_window_task.go | 6 ++--- aws/resource_aws_ssm_patch_baseline.go | 4 ++-- aws/resource_aws_volume_attachment.go | 2 +- aws/resource_aws_vpc_endpoint.go | 7 +++--- aws/resource_aws_vpn_connection.go | 5 ++-- aws/resource_aws_waf_byte_match_set.go | 9 ++++---- aws/resource_aws_waf_byte_match_set_test.go | 5 ++-- aws/resource_aws_waf_geo_match_set.go | 9 ++++---- aws/resource_aws_waf_geo_match_set_test.go | 5 ++-- aws/resource_aws_waf_size_constraint_set.go | 12 +++++----- ...source_aws_waf_size_constraint_set_test.go | 3 +-- ...esource_aws_waf_sql_injection_match_set.go | 12 +++++----- ...ce_aws_waf_sql_injection_match_set_test.go | 5 ++-- aws/resource_aws_waf_xss_match_set.go | 9 ++++---- aws/resource_aws_waf_xss_match_set_test.go | 5 ++-- ...resource_aws_wafregional_byte_match_set.go | 14 +++++------ ...rce_aws_wafregional_byte_match_set_test.go | 5 ++-- ...rce_aws_wafregional_size_constraint_set.go | 10 ++++---- ...ws_wafregional_size_constraint_set_test.go | 3 +-- ...aws_wafregional_sql_injection_match_set.go | 4 ++-- ...urce_aws_wafregional_xss_match_set_test.go | 5 ++-- aws/structure.go | 2 +- aws/tagsNeptune.go | 2 +- aws/tagsRDS.go | 2 +- aws/tags_dms_test.go | 2 +- aws/waf_token_handlers.go | 4 ++-- aws/wafregionl_token_handlers.go | 4 ++-- 141 files changed, 343 insertions(+), 390 deletions(-) diff --git a/aws/config.go b/aws/config.go index ddc5d88570f..f1a4c7e8b22 100644 --- a/aws/config.go +++ b/aws/config.go @@ -96,7 +96,6 @@ import ( "github.com/aws/aws-sdk-go/service/waf" "github.com/aws/aws-sdk-go/service/wafregional" "github.com/davecgh/go-spew/spew" - "github.com/hashicorp/errwrap" "github.com/hashicorp/go-cleanhttp" "github.com/hashicorp/terraform/helper/logging" "github.com/hashicorp/terraform/terraform" @@ -347,7 +346,7 @@ func (c *Config) Client() (interface{}, error) { Please see https://terraform.io/docs/providers/aws/index.html for more information on providing credentials for the AWS Provider`) } - return nil, errwrap.Wrapf("Error creating AWS session: {{err}}", err) + return nil, fmt.Errorf("Error creating AWS session: %s", err) } sess.Handlers.Build.PushBackNamed(addTerraformVersionToUserAgent) diff --git a/aws/data_source_aws_autoscaling_groups.go b/aws/data_source_aws_autoscaling_groups.go index 7bc4dc9c350..a2492baff48 100644 --- a/aws/data_source_aws_autoscaling_groups.go +++ b/aws/data_source_aws_autoscaling_groups.go @@ -78,7 +78,7 @@ func dataSourceAwsAutoscalingGroupsRead(d *schema.ResourceData, meta interface{} sort.Strings(raw) if err := d.Set("names", raw); err != nil { - return fmt.Errorf("[WARN] Error setting Autoscaling Group Names: %s", err) + return fmt.Errorf("Error setting Autoscaling Group Names: %s", err) } return nil diff --git a/aws/data_source_aws_availability_zones.go b/aws/data_source_aws_availability_zones.go index 3a6f3876433..3d033de6ddb 100644 --- a/aws/data_source_aws_availability_zones.go +++ b/aws/data_source_aws_availability_zones.go @@ -67,7 +67,7 @@ func dataSourceAwsAvailabilityZonesRead(d *schema.ResourceData, meta interface{} sort.Strings(raw) if err := d.Set("names", raw); err != nil { - return fmt.Errorf("[WARN] Error setting Availability Zones: %s", err) + return fmt.Errorf("Error setting Availability Zones: %s", err) } return nil diff --git a/aws/data_source_aws_cloudformation_stack.go b/aws/data_source_aws_cloudformation_stack.go index b991c96862a..84bc051fbc4 100644 --- a/aws/data_source_aws_cloudformation_stack.go +++ b/aws/data_source_aws_cloudformation_stack.go @@ -6,7 +6,6 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/cloudformation" - "github.com/hashicorp/errwrap" "github.com/hashicorp/terraform/helper/schema" ) @@ -116,7 +115,7 @@ func dataSourceAwsCloudFormationStackRead(d *schema.ResourceData, meta interface template, err := normalizeCloudFormationTemplate(*tOut.TemplateBody) if err != nil { - return errwrap.Wrapf("template body contains an invalid JSON or YAML: {{err}}", err) + return fmt.Errorf("template body contains an invalid JSON or YAML: %s", err) } d.Set("template_body", template) diff --git a/aws/data_source_aws_db_instance.go b/aws/data_source_aws_db_instance.go index 2dee7c8e248..fe3fb8898d1 100644 --- a/aws/data_source_aws_db_instance.go +++ b/aws/data_source_aws_db_instance.go @@ -247,7 +247,7 @@ func dataSourceAwsDbInstanceRead(d *schema.ResourceData, meta interface{}) error parameterGroups = append(parameterGroups, *v.DBParameterGroupName) } if err := d.Set("db_parameter_groups", parameterGroups); err != nil { - return fmt.Errorf("[DEBUG] Error setting db_parameter_groups attribute: %#v, error: %#v", parameterGroups, err) + return fmt.Errorf("Error setting db_parameter_groups attribute: %#v, error: %#v", parameterGroups, err) } var dbSecurityGroups []string @@ -255,7 +255,7 @@ func dataSourceAwsDbInstanceRead(d *schema.ResourceData, meta interface{}) error dbSecurityGroups = append(dbSecurityGroups, *v.DBSecurityGroupName) } if err := d.Set("db_security_groups", dbSecurityGroups); err != nil { - return fmt.Errorf("[DEBUG] Error setting db_security_groups attribute: %#v, error: %#v", dbSecurityGroups, err) + return fmt.Errorf("Error setting db_security_groups attribute: %#v, error: %#v", dbSecurityGroups, err) } if dbInstance.DBSubnetGroup != nil { @@ -287,7 +287,7 @@ func dataSourceAwsDbInstanceRead(d *schema.ResourceData, meta interface{}) error optionGroups = append(optionGroups, *v.OptionGroupName) } if err := d.Set("option_group_memberships", optionGroups); err != nil { - return fmt.Errorf("[DEBUG] Error setting option_group_memberships attribute: %#v, error: %#v", optionGroups, err) + return fmt.Errorf("Error setting option_group_memberships attribute: %#v, error: %#v", optionGroups, err) } d.Set("preferred_backup_window", dbInstance.PreferredBackupWindow) @@ -304,7 +304,7 @@ func dataSourceAwsDbInstanceRead(d *schema.ResourceData, meta interface{}) error vpcSecurityGroups = append(vpcSecurityGroups, *v.VpcSecurityGroupId) } if err := d.Set("vpc_security_groups", vpcSecurityGroups); err != nil { - return fmt.Errorf("[DEBUG] Error setting vpc_security_groups attribute: %#v, error: %#v", vpcSecurityGroups, err) + return fmt.Errorf("Error setting vpc_security_groups attribute: %#v, error: %#v", vpcSecurityGroups, err) } return nil diff --git a/aws/data_source_aws_efs_file_system.go b/aws/data_source_aws_efs_file_system.go index f448badaa99..7665c12e954 100644 --- a/aws/data_source_aws_efs_file_system.go +++ b/aws/data_source_aws_efs_file_system.go @@ -6,7 +6,6 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/efs" - "github.com/hashicorp/errwrap" "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/validation" ) @@ -66,7 +65,7 @@ func dataSourceAwsEfsFileSystemRead(d *schema.ResourceData, meta interface{}) er log.Printf("[DEBUG] Reading EFS File System: %s", describeEfsOpts) describeResp, err := efsconn.DescribeFileSystems(describeEfsOpts) if err != nil { - return errwrap.Wrapf("Error retrieving EFS: {{err}}", err) + return fmt.Errorf("Error retrieving EFS: %s", err) } if len(describeResp.FileSystems) != 1 { return fmt.Errorf("Search returned %d results, please revise so only one is returned", len(describeResp.FileSystems)) diff --git a/aws/data_source_aws_efs_file_system_test.go b/aws/data_source_aws_efs_file_system_test.go index 6e94d0b9bb2..bd3ff969b46 100644 --- a/aws/data_source_aws_efs_file_system_test.go +++ b/aws/data_source_aws_efs_file_system_test.go @@ -2,11 +2,11 @@ package aws import ( "fmt" + "regexp" "testing" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" - "regexp" ) func TestAccDataSourceAwsEfsFileSystem(t *testing.T) { diff --git a/aws/data_source_aws_efs_mount_target.go b/aws/data_source_aws_efs_mount_target.go index e2c6045d73b..21d40f1285b 100644 --- a/aws/data_source_aws_efs_mount_target.go +++ b/aws/data_source_aws_efs_mount_target.go @@ -6,7 +6,6 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/efs" - "github.com/hashicorp/errwrap" "github.com/hashicorp/terraform/helper/schema" ) @@ -61,7 +60,7 @@ func dataSourceAwsEfsMountTargetRead(d *schema.ResourceData, meta interface{}) e log.Printf("[DEBUG] Reading EFS Mount Target: %s", describeEfsOpts) resp, err := efsconn.DescribeMountTargets(describeEfsOpts) if err != nil { - return errwrap.Wrapf("Error retrieving EFS Mount Target: {{err}}", err) + return fmt.Errorf("Error retrieving EFS Mount Target: %s", err) } if len(resp.MountTargets) != 1 { return fmt.Errorf("Search returned %d results, please revise so only one is returned", len(resp.MountTargets)) @@ -89,7 +88,7 @@ func dataSourceAwsEfsMountTargetRead(d *schema.ResourceData, meta interface{}) e } if err := d.Set("dns_name", resourceAwsEfsMountTargetDnsName(*mt.FileSystemId, meta.(*AWSClient).region)); err != nil { - return fmt.Errorf("[DEBUG] Error setting dns_name error: %#v", err) + return fmt.Errorf("Error setting dns_name error: %#v", err) } return nil diff --git a/aws/data_source_aws_iam_group.go b/aws/data_source_aws_iam_group.go index 942f2a97de4..9376caf4b1b 100644 --- a/aws/data_source_aws_iam_group.go +++ b/aws/data_source_aws_iam_group.go @@ -6,7 +6,6 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/iam" - "github.com/hashicorp/errwrap" "github.com/hashicorp/terraform/helper/schema" ) @@ -47,7 +46,7 @@ func dataSourceAwsIAMGroupRead(d *schema.ResourceData, meta interface{}) error { log.Printf("[DEBUG] Reading IAM Group: %s", req) resp, err := iamconn.GetGroup(req) if err != nil { - return errwrap.Wrapf("Error getting group: {{err}}", err) + return fmt.Errorf("Error getting group: %s", err) } if resp == nil { return fmt.Errorf("no IAM group found") diff --git a/aws/data_source_aws_iam_instance_profile.go b/aws/data_source_aws_iam_instance_profile.go index 344f3b99de0..de36b71893a 100644 --- a/aws/data_source_aws_iam_instance_profile.go +++ b/aws/data_source_aws_iam_instance_profile.go @@ -6,7 +6,6 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/iam" - "github.com/hashicorp/errwrap" "github.com/hashicorp/terraform/helper/schema" ) @@ -59,7 +58,7 @@ func dataSourceAwsIAMInstanceProfileRead(d *schema.ResourceData, meta interface{ log.Printf("[DEBUG] Reading IAM Instance Profile: %s", req) resp, err := iamconn.GetInstanceProfile(req) if err != nil { - return errwrap.Wrapf("Error getting instance profiles: {{err}}", err) + return fmt.Errorf("Error getting instance profiles: %s", err) } if resp == nil { return fmt.Errorf("no IAM instance profile found") diff --git a/aws/data_source_aws_iam_server_certificate.go b/aws/data_source_aws_iam_server_certificate.go index 49feefa2398..16403fbd15d 100644 --- a/aws/data_source_aws_iam_server_certificate.go +++ b/aws/data_source_aws_iam_server_certificate.go @@ -9,7 +9,6 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/iam" - "github.com/hashicorp/errwrap" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/validation" @@ -124,7 +123,7 @@ func dataSourceAwsIAMServerCertificateRead(d *schema.ResourceData, meta interfac return true }) if err != nil { - return errwrap.Wrapf("Error describing certificates: {{err}}", err) + return fmt.Errorf("Error describing certificates: %s", err) } if len(metadatas) == 0 { diff --git a/aws/data_source_aws_kms_alias.go b/aws/data_source_aws_kms_alias.go index 91dfacb7ee6..c002d1da8f8 100644 --- a/aws/data_source_aws_kms_alias.go +++ b/aws/data_source_aws_kms_alias.go @@ -7,7 +7,6 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/kms" - "github.com/hashicorp/errwrap" "github.com/hashicorp/terraform/helper/schema" ) @@ -54,7 +53,7 @@ func dataSourceAwsKmsAliasRead(d *schema.ResourceData, meta interface{}) error { return true }) if err != nil { - return errwrap.Wrapf("Error fetch KMS alias list: {{err}}", err) + return fmt.Errorf("Error fetch KMS alias list: %s", err) } if alias == nil { @@ -80,7 +79,7 @@ func dataSourceAwsKmsAliasRead(d *schema.ResourceData, meta interface{}) error { } resp, err := conn.DescribeKey(req) if err != nil { - return errwrap.Wrapf("Error calling KMS DescribeKey: {{err}}", err) + return fmt.Errorf("Error calling KMS DescribeKey: %s", err) } d.Set("target_key_arn", resp.KeyMetadata.Arn) diff --git a/aws/data_source_aws_kms_key.go b/aws/data_source_aws_kms_key.go index 35c231ead10..a05f8edfd6e 100644 --- a/aws/data_source_aws_kms_key.go +++ b/aws/data_source_aws_kms_key.go @@ -2,10 +2,11 @@ package aws import ( "fmt" + "time" + "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/kms" "github.com/hashicorp/terraform/helper/schema" - "time" ) func dataSourceAwsKmsKey() *schema.Resource { diff --git a/aws/data_source_aws_kms_key_test.go b/aws/data_source_aws_kms_key_test.go index 6bb239ceb27..e52e3c25192 100644 --- a/aws/data_source_aws_kms_key_test.go +++ b/aws/data_source_aws_kms_key_test.go @@ -2,11 +2,11 @@ package aws import ( "fmt" + "regexp" "testing" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" - "regexp" ) func TestAccDataSourceAwsKmsKey_basic(t *testing.T) { diff --git a/aws/data_source_aws_lb_listener.go b/aws/data_source_aws_lb_listener.go index 37ac1ef94d0..0e54e0862d5 100644 --- a/aws/data_source_aws_lb_listener.go +++ b/aws/data_source_aws_lb_listener.go @@ -89,7 +89,7 @@ func dataSourceAwsLbListenerRead(d *schema.ResourceData, meta interface{}) error return err } if len(resp.Listeners) == 0 { - return fmt.Errorf("[DEBUG] no listener exists for load balancer: %s", lbArn) + return fmt.Errorf("no listener exists for load balancer: %s", lbArn) } for _, listener := range resp.Listeners { if *listener.Port == int64(port.(int)) { diff --git a/aws/data_source_aws_redshift_cluster.go b/aws/data_source_aws_redshift_cluster.go index 41666e7fb65..4aaeeb251ed 100644 --- a/aws/data_source_aws_redshift_cluster.go +++ b/aws/data_source_aws_redshift_cluster.go @@ -207,7 +207,7 @@ func dataSourceAwsRedshiftClusterRead(d *schema.ResourceData, meta interface{}) csg = append(csg, *g.ClusterSecurityGroupName) } if err := d.Set("cluster_security_groups", csg); err != nil { - return fmt.Errorf("[DEBUG] Error saving Cluster Security Group Names to state for Redshift Cluster (%s): %s", cluster, err) + return fmt.Errorf("Error saving Cluster Security Group Names to state for Redshift Cluster (%s): %s", cluster, err) } d.Set("cluster_subnet_group_name", rsc.ClusterSubnetGroupName) @@ -238,7 +238,7 @@ func dataSourceAwsRedshiftClusterRead(d *schema.ResourceData, meta interface{}) iamRoles = append(iamRoles, *i.IamRoleArn) } if err := d.Set("iam_roles", iamRoles); err != nil { - return fmt.Errorf("[DEBUG] Error saving IAM Roles to state for Redshift Cluster (%s): %s", cluster, err) + return fmt.Errorf("Error saving IAM Roles to state for Redshift Cluster (%s): %s", cluster, err) } d.Set("kms_key_id", rsc.KmsKeyId) @@ -256,7 +256,7 @@ func dataSourceAwsRedshiftClusterRead(d *schema.ResourceData, meta interface{}) vpcg = append(vpcg, *g.VpcSecurityGroupId) } if err := d.Set("vpc_security_group_ids", vpcg); err != nil { - return fmt.Errorf("[DEBUG] Error saving VPC Security Group IDs to state for Redshift Cluster (%s): %s", cluster, err) + return fmt.Errorf("Error saving VPC Security Group IDs to state for Redshift Cluster (%s): %s", cluster, err) } log.Printf("[INFO] Reading Redshift Cluster Logging Status: %s", cluster) diff --git a/aws/data_source_aws_security_groups_test.go b/aws/data_source_aws_security_groups_test.go index 1fa14d6a3b7..25adf5f34db 100644 --- a/aws/data_source_aws_security_groups_test.go +++ b/aws/data_source_aws_security_groups_test.go @@ -2,9 +2,10 @@ package aws import ( "fmt" + "testing" + "github.com/hashicorp/terraform/helper/acctest" "github.com/hashicorp/terraform/helper/resource" - "testing" ) func TestAccDataSourceAwsSecurityGroups_tag(t *testing.T) { diff --git a/aws/data_source_aws_sns.go b/aws/data_source_aws_sns.go index 19ce56d3e69..a28a118793e 100644 --- a/aws/data_source_aws_sns.go +++ b/aws/data_source_aws_sns.go @@ -7,7 +7,6 @@ import ( "time" "github.com/aws/aws-sdk-go/service/sns" - "github.com/hashicorp/errwrap" "github.com/hashicorp/terraform/helper/schema" ) @@ -56,7 +55,7 @@ func dataSourceAwsSnsTopicsRead(d *schema.ResourceData, meta interface{}) error return true }) if err != nil { - return errwrap.Wrapf("Error describing topics: {{err}}", err) + return fmt.Errorf("Error describing topics: %s", err) } if len(arns) == 0 { diff --git a/aws/data_source_aws_ssm_parameter.go b/aws/data_source_aws_ssm_parameter.go index 024eedd8f8a..68df28df4c0 100644 --- a/aws/data_source_aws_ssm_parameter.go +++ b/aws/data_source_aws_ssm_parameter.go @@ -8,7 +8,6 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/arn" "github.com/aws/aws-sdk-go/service/ssm" - "github.com/hashicorp/errwrap" "github.com/hashicorp/terraform/helper/schema" ) @@ -56,7 +55,7 @@ func dataAwsSsmParameterRead(d *schema.ResourceData, meta interface{}) error { resp, err := ssmconn.GetParameter(paramInput) if err != nil { - return errwrap.Wrapf("[ERROR] Error describing SSM parameter: {{err}}", err) + return fmt.Errorf("Error describing SSM parameter: %s", err) } param := resp.Parameter diff --git a/aws/data_source_aws_subnet_test.go b/aws/data_source_aws_subnet_test.go index 347a38453ee..e7f6e9be0a0 100644 --- a/aws/data_source_aws_subnet_test.go +++ b/aws/data_source_aws_subnet_test.go @@ -2,12 +2,12 @@ package aws import ( "fmt" + "regexp" "testing" "github.com/hashicorp/terraform/helper/acctest" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" - "regexp" ) func TestAccDataSourceAwsSubnet_basic(t *testing.T) { diff --git a/aws/import_aws_s3_bucket.go b/aws/import_aws_s3_bucket.go index ba2129e1ff7..d8d051b8bc4 100644 --- a/aws/import_aws_s3_bucket.go +++ b/aws/import_aws_s3_bucket.go @@ -1,10 +1,11 @@ package aws import ( + "fmt" + "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/service/s3" - "github.com/hashicorp/errwrap" "github.com/hashicorp/terraform/helper/schema" ) @@ -24,7 +25,7 @@ func resourceAwsS3BucketImportState( // Bucket without policy return results, nil } - return nil, errwrap.Wrapf("Error importing AWS S3 bucket policy: {{err}}", err) + return nil, fmt.Errorf("Error importing AWS S3 bucket policy: %s", err) } policy := resourceAwsS3BucketPolicy() diff --git a/aws/import_aws_security_group.go b/aws/import_aws_security_group.go index 3954ed23988..bbae893d6bf 100644 --- a/aws/import_aws_security_group.go +++ b/aws/import_aws_security_group.go @@ -4,7 +4,6 @@ import ( "fmt" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/hashicorp/errwrap" "github.com/hashicorp/terraform/helper/schema" ) @@ -179,7 +178,7 @@ func resourceAwsSecurityGroupImportStatePermPair(sg *ec2.SecurityGroup, ruleType } if err := setFromIPPerm(d, sg, perm); err != nil { - return nil, errwrap.Wrapf("Error importing AWS Security Group: {{err}}", err) + return nil, fmt.Errorf("Error importing AWS Security Group: %s", err) } return d, nil diff --git a/aws/resource_aws_api_gateway_usage_plan.go b/aws/resource_aws_api_gateway_usage_plan.go index e7786b0458d..cf4653825cb 100644 --- a/aws/resource_aws_api_gateway_usage_plan.go +++ b/aws/resource_aws_api_gateway_usage_plan.go @@ -1,12 +1,12 @@ package aws import ( + "errors" "fmt" "log" "strconv" "time" - "errors" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/service/apigateway" @@ -251,19 +251,19 @@ func resourceAwsApiGatewayUsagePlanRead(d *schema.ResourceData, meta interface{} if up.ApiStages != nil { if err := d.Set("api_stages", flattenApiGatewayUsageApiStages(up.ApiStages)); err != nil { - return fmt.Errorf("[DEBUG] Error setting api_stages error: %#v", err) + return fmt.Errorf("Error setting api_stages error: %#v", err) } } if up.Throttle != nil { if err := d.Set("throttle_settings", flattenApiGatewayUsagePlanThrottling(up.Throttle)); err != nil { - return fmt.Errorf("[DEBUG] Error setting throttle_settings error: %#v", err) + return fmt.Errorf("Error setting throttle_settings error: %#v", err) } } if up.Quota != nil { if err := d.Set("quota_settings", flattenApiGatewayUsagePlanQuota(up.Quota)); err != nil { - return fmt.Errorf("[DEBUG] Error setting quota_settings error: %#v", err) + return fmt.Errorf("Error setting quota_settings error: %#v", err) } } diff --git a/aws/resource_aws_api_gateway_vpc_link.go b/aws/resource_aws_api_gateway_vpc_link.go index ae7e4557288..3d4f2676bd7 100644 --- a/aws/resource_aws_api_gateway_vpc_link.go +++ b/aws/resource_aws_api_gateway_vpc_link.go @@ -70,7 +70,7 @@ func resourceAwsApiGatewayVpcLinkCreate(d *schema.ResourceData, meta interface{} _, err = stateConf.WaitForState() if err != nil { d.SetId("") - return fmt.Errorf("[WARN] Error waiting for APIGateway Vpc Link status to be \"%s\": %s", apigateway.VpcLinkStatusAvailable, err) + return fmt.Errorf("Error waiting for APIGateway Vpc Link status to be \"%s\": %s", apigateway.VpcLinkStatusAvailable, err) } return nil @@ -145,7 +145,7 @@ func resourceAwsApiGatewayVpcLinkUpdate(d *schema.ResourceData, meta interface{} _, err = stateConf.WaitForState() if err != nil { - return fmt.Errorf("[WARN] Error waiting for APIGateway Vpc Link status to be \"%s\": %s", apigateway.VpcLinkStatusAvailable, err) + return fmt.Errorf("Error waiting for APIGateway Vpc Link status to be \"%s\": %s", apigateway.VpcLinkStatusAvailable, err) } return nil diff --git a/aws/resource_aws_athena_database.go b/aws/resource_aws_athena_database.go index b004893723e..d9eb09bd2f1 100644 --- a/aws/resource_aws_athena_database.go +++ b/aws/resource_aws_athena_database.go @@ -126,7 +126,7 @@ func executeAndExpectNoRowsWhenCreate(qeid string, d *schema.ResourceData, conn return err } if len(rs.Rows) != 0 { - return fmt.Errorf("[ERROR] Athena create database, unexpected query result: %s", flattenAthenaResultSet(rs)) + return fmt.Errorf("Athena create database, unexpected query result: %s", flattenAthenaResultSet(rs)) } return nil } @@ -143,7 +143,7 @@ func executeAndExpectMatchingRow(qeid string, dbName string, conn *athena.Athena } } } - return fmt.Errorf("[ERROR] Athena not found database: %s, query result: %s", dbName, flattenAthenaResultSet(rs)) + return fmt.Errorf("Athena not found database: %s, query result: %s", dbName, flattenAthenaResultSet(rs)) } func executeAndExpectNoRowsWhenDrop(qeid string, d *schema.ResourceData, conn *athena.Athena) error { @@ -152,7 +152,7 @@ func executeAndExpectNoRowsWhenDrop(qeid string, d *schema.ResourceData, conn *a return err } if len(rs.Rows) != 0 { - return fmt.Errorf("[ERROR] Athena drop database, unexpected query result: %s", flattenAthenaResultSet(rs)) + return fmt.Errorf("Athena drop database, unexpected query result: %s", flattenAthenaResultSet(rs)) } return nil } diff --git a/aws/resource_aws_autoscaling_attachment.go b/aws/resource_aws_autoscaling_attachment.go index 0c2748df076..8563abd0e01 100644 --- a/aws/resource_aws_autoscaling_attachment.go +++ b/aws/resource_aws_autoscaling_attachment.go @@ -6,7 +6,6 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/autoscaling" - "github.com/hashicorp/errwrap" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" ) @@ -52,7 +51,7 @@ func resourceAwsAutoscalingAttachmentCreate(d *schema.ResourceData, meta interfa log.Printf("[INFO] registering asg %s with ELBs %s", asgName, v.(string)) if _, err := asgconn.AttachLoadBalancers(attachOpts); err != nil { - return errwrap.Wrapf(fmt.Sprintf("Failure attaching AutoScaling Group %s with Elastic Load Balancer: %s: {{err}}", asgName, v.(string)), err) + return fmt.Errorf("Failure attaching AutoScaling Group %s with Elastic Load Balancer: %s: %s", asgName, v.(string), err) } } @@ -65,7 +64,7 @@ func resourceAwsAutoscalingAttachmentCreate(d *schema.ResourceData, meta interfa log.Printf("[INFO] registering asg %s with ALB Target Group %s", asgName, v.(string)) if _, err := asgconn.AttachLoadBalancerTargetGroups(attachOpts); err != nil { - return errwrap.Wrapf(fmt.Sprintf("Failure attaching AutoScaling Group %s with ALB Target Group: %s: {{err}}", asgName, v.(string)), err) + return fmt.Errorf("Failure attaching AutoScaling Group %s with ALB Target Group: %s: %s", asgName, v.(string), err) } } @@ -137,7 +136,7 @@ func resourceAwsAutoscalingAttachmentDelete(d *schema.ResourceData, meta interfa log.Printf("[INFO] Deleting ELB %s association from: %s", v.(string), asgName) if _, err := asgconn.DetachLoadBalancers(detachOpts); err != nil { - return errwrap.Wrapf(fmt.Sprintf("Failure detaching AutoScaling Group %s with Elastic Load Balancer: %s: {{err}}", asgName, v.(string)), err) + return fmt.Errorf("Failure detaching AutoScaling Group %s with Elastic Load Balancer: %s: %s", asgName, v.(string), err) } } @@ -149,7 +148,7 @@ func resourceAwsAutoscalingAttachmentDelete(d *schema.ResourceData, meta interfa log.Printf("[INFO] Deleting ALB Target Group %s association from: %s", v.(string), asgName) if _, err := asgconn.DetachLoadBalancerTargetGroups(detachOpts); err != nil { - return errwrap.Wrapf(fmt.Sprintf("Failure detaching AutoScaling Group %s with ALB Target Group: %s: {{err}}", asgName, v.(string)), err) + return fmt.Errorf("Failure detaching AutoScaling Group %s with ALB Target Group: %s: %s", asgName, v.(string), err) } } diff --git a/aws/resource_aws_autoscaling_group.go b/aws/resource_aws_autoscaling_group.go index c18075a9d80..c5c7a4ee44b 100644 --- a/aws/resource_aws_autoscaling_group.go +++ b/aws/resource_aws_autoscaling_group.go @@ -6,7 +6,6 @@ import ( "strings" "time" - "github.com/hashicorp/errwrap" "github.com/hashicorp/terraform/helper/customdiff" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" @@ -752,7 +751,7 @@ func resourceAwsAutoscalingGroupUpdate(d *schema.ResourceData, meta interface{}) LoadBalancerNames: remove, }) if err != nil { - return fmt.Errorf("[WARN] Error updating Load Balancers for AutoScaling Group (%s), error: %s", d.Id(), err) + return fmt.Errorf("Error updating Load Balancers for AutoScaling Group (%s), error: %s", d.Id(), err) } } @@ -762,7 +761,7 @@ func resourceAwsAutoscalingGroupUpdate(d *schema.ResourceData, meta interface{}) LoadBalancerNames: add, }) if err != nil { - return fmt.Errorf("[WARN] Error updating Load Balancers for AutoScaling Group (%s), error: %s", d.Id(), err) + return fmt.Errorf("Error updating Load Balancers for AutoScaling Group (%s), error: %s", d.Id(), err) } } } @@ -788,7 +787,7 @@ func resourceAwsAutoscalingGroupUpdate(d *schema.ResourceData, meta interface{}) TargetGroupARNs: remove, }) if err != nil { - return fmt.Errorf("[WARN] Error updating Load Balancers Target Groups for AutoScaling Group (%s), error: %s", d.Id(), err) + return fmt.Errorf("Error updating Load Balancers Target Groups for AutoScaling Group (%s), error: %s", d.Id(), err) } } @@ -798,26 +797,26 @@ func resourceAwsAutoscalingGroupUpdate(d *schema.ResourceData, meta interface{}) TargetGroupARNs: add, }) if err != nil { - return fmt.Errorf("[WARN] Error updating Load Balancers Target Groups for AutoScaling Group (%s), error: %s", d.Id(), err) + return fmt.Errorf("Error updating Load Balancers Target Groups for AutoScaling Group (%s), error: %s", d.Id(), err) } } } if shouldWaitForCapacity { if err := waitForASGCapacity(d, meta, capacitySatisfiedUpdate); err != nil { - return errwrap.Wrapf("Error waiting for AutoScaling Group Capacity: {{err}}", err) + return fmt.Errorf("Error waiting for AutoScaling Group Capacity: %s", err) } } if d.HasChange("enabled_metrics") { if err := updateASGMetricsCollection(d, conn); err != nil { - return errwrap.Wrapf("Error updating AutoScaling Group Metrics collection: {{err}}", err) + return fmt.Errorf("Error updating AutoScaling Group Metrics collection: %s", err) } } if d.HasChange("suspended_processes") { if err := updateASGSuspendedProcesses(d, conn); err != nil { - return errwrap.Wrapf("Error updating AutoScaling Group Suspended Processes: {{err}}", err) + return fmt.Errorf("Error updating AutoScaling Group Suspended Processes: %s", err) } } diff --git a/aws/resource_aws_autoscaling_group_waiting.go b/aws/resource_aws_autoscaling_group_waiting.go index 80b1f90e9c3..8bde39baba9 100644 --- a/aws/resource_aws_autoscaling_group_waiting.go +++ b/aws/resource_aws_autoscaling_group_waiting.go @@ -8,7 +8,6 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/autoscaling" - "github.com/hashicorp/errwrap" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" ) @@ -124,8 +123,7 @@ func waitForASGCapacity( recentStatus = fmt.Sprintf("(Failed to describe scaling activities: %s)", aErr) } - msg := fmt.Sprintf("{{err}}. Most recent activity: %s", recentStatus) - return errwrap.Wrapf(msg, err) + return fmt.Errorf("%s. Most recent activity: %s", err, recentStatus) } type capacitySatisfiedFunc func(*schema.ResourceData, int, int) (bool, string) diff --git a/aws/resource_aws_autoscaling_lifecycle_hook.go b/aws/resource_aws_autoscaling_lifecycle_hook.go index 07315114550..500924eac48 100644 --- a/aws/resource_aws_autoscaling_lifecycle_hook.go +++ b/aws/resource_aws_autoscaling_lifecycle_hook.go @@ -1,6 +1,7 @@ package aws import ( + "fmt" "log" "strings" "time" @@ -8,7 +9,6 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/service/autoscaling" - "github.com/hashicorp/errwrap" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" ) @@ -67,10 +67,10 @@ func resourceAwsAutoscalingLifecycleHookPutOp(conn *autoscaling.AutoScaling, par if err != nil { if awsErr, ok := err.(awserr.Error); ok { if strings.Contains(awsErr.Message(), "Unable to publish test message to notification target") { - return resource.RetryableError(errwrap.Wrapf("[DEBUG] Retrying AWS AutoScaling Lifecycle Hook: {{err}}", awsErr)) + return resource.RetryableError(fmt.Errorf("Retrying AWS AutoScaling Lifecycle Hook: %s", awsErr)) } } - return resource.NonRetryableError(errwrap.Wrapf("Error putting lifecycle hook: {{err}}", err)) + return resource.NonRetryableError(fmt.Errorf("Error putting lifecycle hook: %s", err)) } return nil }) @@ -128,7 +128,7 @@ func resourceAwsAutoscalingLifecycleHookDelete(d *schema.ResourceData, meta inte LifecycleHookName: aws.String(d.Get("name").(string)), } if _, err := autoscalingconn.DeleteLifecycleHook(¶ms); err != nil { - return errwrap.Wrapf("Autoscaling Lifecycle Hook: {{err}}", err) + return fmt.Errorf("Autoscaling Lifecycle Hook: %s", err) } return nil @@ -178,7 +178,7 @@ func getAwsAutoscalingLifecycleHook(d *schema.ResourceData, meta interface{}) (* log.Printf("[DEBUG] AutoScaling Lifecycle Hook Describe Params: %#v", params) resp, err := autoscalingconn.DescribeLifecycleHooks(¶ms) if err != nil { - return nil, errwrap.Wrapf("Error retrieving lifecycle hooks: {{err}}", err) + return nil, fmt.Errorf("Error retrieving lifecycle hooks: %s", err) } // find lifecycle hooks diff --git a/aws/resource_aws_autoscaling_notification.go b/aws/resource_aws_autoscaling_notification.go index 2c35ea5eb14..77fb744feed 100644 --- a/aws/resource_aws_autoscaling_notification.go +++ b/aws/resource_aws_autoscaling_notification.go @@ -166,7 +166,7 @@ func addNotificationConfigToGroupsWithTopic(conn *autoscaling.AutoScaling, group _, err := conn.PutNotificationConfiguration(opts) if err != nil { if awsErr, ok := err.(awserr.Error); ok { - return fmt.Errorf("[WARN] Error creating Autoscaling Group Notification for Group %s, error: \"%s\", code: \"%s\"", *a, awsErr.Message(), awsErr.Code()) + return fmt.Errorf("Error creating Autoscaling Group Notification for Group %s, error: \"%s\", code: \"%s\"", *a, awsErr.Message(), awsErr.Code()) } return err } @@ -183,7 +183,7 @@ func removeNotificationConfigToGroupsWithTopic(conn *autoscaling.AutoScaling, gr _, err := conn.DeleteNotificationConfiguration(opts) if err != nil { - return fmt.Errorf("[WARN] Error deleting notification configuration for ASG \"%s\", Topic ARN \"%s\"", *r, topic) + return fmt.Errorf("Error deleting notification configuration for ASG \"%s\", Topic ARN \"%s\"", *r, topic) } } return nil diff --git a/aws/resource_aws_batch_job_queue.go b/aws/resource_aws_batch_job_queue.go index ab15da86c5f..821999471b2 100644 --- a/aws/resource_aws_batch_job_queue.go +++ b/aws/resource_aws_batch_job_queue.go @@ -73,7 +73,7 @@ func resourceAwsBatchJobQueueCreate(d *schema.ResourceData, meta interface{}) er _, err = stateConf.WaitForState() if err != nil { - return fmt.Errorf("[WARN] Error waiting for JobQueue state to be \"VALID\": %s", err) + return fmt.Errorf("Error waiting for JobQueue state to be \"VALID\": %s", err) } arn := *out.JobQueueArn @@ -91,7 +91,7 @@ func resourceAwsBatchJobQueueRead(d *schema.ResourceData, meta interface{}) erro return err } if jq == nil { - return fmt.Errorf("[WARN] Error reading JobQueue: \"%s\"", err) + return fmt.Errorf("Error reading JobQueue: \"%s\"", err) } d.Set("arn", jq.JobQueueArn) d.Set("compute_environments", jq.ComputeEnvironmentOrder) diff --git a/aws/resource_aws_cloudformation_stack.go b/aws/resource_aws_cloudformation_stack.go index db28c498393..8dc1a5a3e8a 100644 --- a/aws/resource_aws_cloudformation_stack.go +++ b/aws/resource_aws_cloudformation_stack.go @@ -9,7 +9,6 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/service/cloudformation" - "github.com/hashicorp/errwrap" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/structure" @@ -123,7 +122,7 @@ func resourceAwsCloudFormationStackCreate(d *schema.ResourceData, meta interface if v, ok := d.GetOk("template_body"); ok { template, err := normalizeCloudFormationTemplate(v) if err != nil { - return errwrap.Wrapf("template body contains an invalid JSON or YAML: {{err}}", err) + return fmt.Errorf("template body contains an invalid JSON or YAML: %s", err) } input.TemplateBody = aws.String(template) } @@ -148,7 +147,7 @@ func resourceAwsCloudFormationStackCreate(d *schema.ResourceData, meta interface if v, ok := d.GetOk("policy_body"); ok { policy, err := structure.NormalizeJsonString(v) if err != nil { - return errwrap.Wrapf("policy body contains an invalid JSON: {{err}}", err) + return fmt.Errorf("policy body contains an invalid JSON: %s", err) } input.StackPolicyBody = aws.String(policy) } @@ -300,7 +299,7 @@ func resourceAwsCloudFormationStackRead(d *schema.ResourceData, meta interface{} template, err := normalizeCloudFormationTemplate(*out.TemplateBody) if err != nil { - return errwrap.Wrapf("template body contains an invalid JSON or YAML: {{err}}", err) + return fmt.Errorf("template body contains an invalid JSON or YAML: %s", err) } d.Set("template_body", template) @@ -366,7 +365,7 @@ func resourceAwsCloudFormationStackUpdate(d *schema.ResourceData, meta interface if v, ok := d.GetOk("template_body"); ok && input.TemplateURL == nil { template, err := normalizeCloudFormationTemplate(v) if err != nil { - return errwrap.Wrapf("template body contains an invalid JSON or YAML: {{err}}", err) + return fmt.Errorf("template body contains an invalid JSON or YAML: %s", err) } input.TemplateBody = aws.String(template) } @@ -392,7 +391,7 @@ func resourceAwsCloudFormationStackUpdate(d *schema.ResourceData, meta interface if d.HasChange("policy_body") { policy, err := structure.NormalizeJsonString(d.Get("policy_body")) if err != nil { - return errwrap.Wrapf("policy body contains an invalid JSON: {{err}}", err) + return fmt.Errorf("policy body contains an invalid JSON: %s", err) } input.StackPolicyBody = aws.String(policy) } diff --git a/aws/resource_aws_cloudfront_distribution.go b/aws/resource_aws_cloudfront_distribution.go index bf72d8055d1..1825ab02e26 100644 --- a/aws/resource_aws_cloudfront_distribution.go +++ b/aws/resource_aws_cloudfront_distribution.go @@ -8,7 +8,6 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/service/cloudfront" - "github.com/hashicorp/errwrap" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/validation" @@ -779,9 +778,9 @@ func resourceAwsCloudFrontDistributionRead(d *schema.ResourceData, meta interfac }) if err != nil { - return errwrap.Wrapf(fmt.Sprintf( - "Error retrieving EC2 tags for CloudFront Distribution %q (ARN: %q): {{err}}", - d.Id(), d.Get("arn").(string)), err) + return fmt.Errorf( + "Error retrieving EC2 tags for CloudFront Distribution %q (ARN: %q): %s", + d.Id(), d.Get("arn").(string), err) } if err := d.Set("tags", tagsToMapCloudFront(tagResp.Tags)); err != nil { diff --git a/aws/resource_aws_cloudwatch_event_rule.go b/aws/resource_aws_cloudwatch_event_rule.go index 9f349380c78..fb99dbd2ce9 100644 --- a/aws/resource_aws_cloudwatch_event_rule.go +++ b/aws/resource_aws_cloudwatch_event_rule.go @@ -9,7 +9,6 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/awserr" events "github.com/aws/aws-sdk-go/service/cloudwatchevents" - "github.com/hashicorp/errwrap" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/structure" @@ -92,7 +91,7 @@ func resourceAwsCloudWatchEventRuleCreate(d *schema.ResourceData, meta interface input, err := buildPutRuleInputStruct(d, name) if err != nil { - return errwrap.Wrapf("Creating CloudWatch Event Rule failed: {{err}}", err) + return fmt.Errorf("Creating CloudWatch Event Rule failed: %s", err) } log.Printf("[DEBUG] Creating CloudWatch Event Rule: %s", input) @@ -114,7 +113,7 @@ func resourceAwsCloudWatchEventRuleCreate(d *schema.ResourceData, meta interface return nil }) if err != nil { - return errwrap.Wrapf("Creating CloudWatch Event Rule failed: {{err}}", err) + return fmt.Errorf("Creating CloudWatch Event Rule failed: %s", err) } d.Set("arn", out.RuleArn) @@ -150,7 +149,7 @@ func resourceAwsCloudWatchEventRuleRead(d *schema.ResourceData, meta interface{} if out.EventPattern != nil { pattern, err := structure.NormalizeJsonString(*out.EventPattern) if err != nil { - return errwrap.Wrapf("event pattern contains an invalid JSON: {{err}}", err) + return fmt.Errorf("event pattern contains an invalid JSON: %s", err) } d.Set("event_pattern", pattern) } @@ -184,7 +183,7 @@ func resourceAwsCloudWatchEventRuleUpdate(d *schema.ResourceData, meta interface input, err := buildPutRuleInputStruct(d, d.Id()) if err != nil { - return errwrap.Wrapf("Updating CloudWatch Event Rule failed: {{err}}", err) + return fmt.Errorf("Updating CloudWatch Event Rule failed: %s", err) } log.Printf("[DEBUG] Updating CloudWatch Event Rule: %s", input) @@ -204,7 +203,7 @@ func resourceAwsCloudWatchEventRuleUpdate(d *schema.ResourceData, meta interface return nil }) if err != nil { - return errwrap.Wrapf("Updating CloudWatch Event Rule failed: {{err}}", err) + return fmt.Errorf("Updating CloudWatch Event Rule failed: %s", err) } if d.HasChange("is_enabled") && !d.Get("is_enabled").(bool) { @@ -246,7 +245,7 @@ func buildPutRuleInputStruct(d *schema.ResourceData, name string) (*events.PutRu if v, ok := d.GetOk("event_pattern"); ok { pattern, err := structure.NormalizeJsonString(v) if err != nil { - return nil, errwrap.Wrapf("event pattern contains an invalid JSON: {{err}}", err) + return nil, fmt.Errorf("event pattern contains an invalid JSON: %s", err) } input.EventPattern = aws.String(pattern) } diff --git a/aws/resource_aws_cloudwatch_event_target.go b/aws/resource_aws_cloudwatch_event_target.go index 4b9af0e93bf..44620872aa2 100644 --- a/aws/resource_aws_cloudwatch_event_target.go +++ b/aws/resource_aws_cloudwatch_event_target.go @@ -256,37 +256,37 @@ func resourceAwsCloudWatchEventTargetRead(d *schema.ResourceData, meta interface if t.RunCommandParameters != nil { if err := d.Set("run_command_targets", flattenAwsCloudWatchEventTargetRunParameters(t.RunCommandParameters)); err != nil { - return fmt.Errorf("[DEBUG] Error setting run_command_targets error: %#v", err) + return fmt.Errorf("Error setting run_command_targets error: %#v", err) } } if t.EcsParameters != nil { if err := d.Set("ecs_target", flattenAwsCloudWatchEventTargetEcsParameters(t.EcsParameters)); err != nil { - return fmt.Errorf("[DEBUG] Error setting ecs_target error: %#v", err) + return fmt.Errorf("Error setting ecs_target error: %#v", err) } } if t.BatchParameters != nil { if err := d.Set("batch_target", flattenAwsCloudWatchEventTargetBatchParameters(t.BatchParameters)); err != nil { - return fmt.Errorf("[DEBUG] Error setting batch_target error: %#v", err) + return fmt.Errorf("Error setting batch_target error: %#v", err) } } if t.KinesisParameters != nil { if err := d.Set("kinesis_target", flattenAwsCloudWatchEventTargetKinesisParameters(t.KinesisParameters)); err != nil { - return fmt.Errorf("[DEBUG] Error setting kinesis_target error: %#v", err) + return fmt.Errorf("Error setting kinesis_target error: %#v", err) } } if t.SqsParameters != nil { if err := d.Set("sqs_target", flattenAwsCloudWatchEventTargetSqsParameters(t.SqsParameters)); err != nil { - return fmt.Errorf("[DEBUG] Error setting sqs_target error: %#v", err) + return fmt.Errorf("Error setting sqs_target error: %#v", err) } } if t.InputTransformer != nil { if err := d.Set("input_transformer", flattenAwsCloudWatchInputTransformer(t.InputTransformer)); err != nil { - return fmt.Errorf("[DEBUG] Error setting input_transformer error: %#v", err) + return fmt.Errorf("Error setting input_transformer error: %#v", err) } } diff --git a/aws/resource_aws_cloudwatch_log_stream.go b/aws/resource_aws_cloudwatch_log_stream.go index 6557787a7db..48b409967f7 100644 --- a/aws/resource_aws_cloudwatch_log_stream.go +++ b/aws/resource_aws_cloudwatch_log_stream.go @@ -7,7 +7,6 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/cloudwatchlogs" - "github.com/hashicorp/errwrap" "github.com/hashicorp/terraform/helper/schema" ) @@ -48,7 +47,7 @@ func resourceAwsCloudWatchLogStreamCreate(d *schema.ResourceData, meta interface LogStreamName: aws.String(d.Get("name").(string)), }) if err != nil { - return errwrap.Wrapf("Creating CloudWatch Log Stream failed: {{err}}", err) + return fmt.Errorf("Creating CloudWatch Log Stream failed: %s", err) } d.SetId(d.Get("name").(string)) @@ -86,7 +85,7 @@ func resourceAwsCloudWatchLogStreamDelete(d *schema.ResourceData, meta interface } _, err := conn.DeleteLogStream(params) if err != nil { - return errwrap.Wrapf("Error deleting CloudWatch Log Stream: {{err}}", err) + return fmt.Errorf("Error deleting CloudWatch Log Stream: %s", err) } return nil diff --git a/aws/resource_aws_cloudwatch_log_subscription_filter.go b/aws/resource_aws_cloudwatch_log_subscription_filter.go index 99e303020dc..c5e12733919 100644 --- a/aws/resource_aws_cloudwatch_log_subscription_filter.go +++ b/aws/resource_aws_cloudwatch_log_subscription_filter.go @@ -98,7 +98,7 @@ func resourceAwsCloudwatchLogSubscriptionFilterUpdate(d *schema.ResourceData, me _, err := conn.PutSubscriptionFilter(¶ms) if err != nil { if awsErr, ok := err.(awserr.Error); ok { - return fmt.Errorf("[WARN] Error updating SubscriptionFilter (%s) for LogGroup (%s), message: \"%s\", code: \"%s\"", + return fmt.Errorf("Error updating SubscriptionFilter (%s) for LogGroup (%s), message: \"%s\", code: \"%s\"", d.Get("name").(string), d.Get("log_group_name").(string), awsErr.Message(), awsErr.Code()) } return err diff --git a/aws/resource_aws_codebuild_project.go b/aws/resource_aws_codebuild_project.go index b08895b8a7e..94fb9e43b7f 100644 --- a/aws/resource_aws_codebuild_project.go +++ b/aws/resource_aws_codebuild_project.go @@ -385,7 +385,7 @@ func resourceAwsCodeBuildProjectCreate(d *schema.ResourceData, meta interface{}) }) if err != nil { - return fmt.Errorf("[ERROR] Error creating CodeBuild project: %s", err) + return fmt.Errorf("Error creating CodeBuild project: %s", err) } d.SetId(*resp.Project.Arn) @@ -563,7 +563,7 @@ func resourceAwsCodeBuildProjectRead(d *schema.ResourceData, meta interface{}) e }) if err != nil { - return fmt.Errorf("[ERROR] Error retreiving Projects: %q", err) + return fmt.Errorf("Error retreiving Projects: %q", err) } // if nothing was found, then return no state diff --git a/aws/resource_aws_codedeploy_deployment_config.go b/aws/resource_aws_codedeploy_deployment_config.go index 0c5e1fce79c..8be6b93337e 100644 --- a/aws/resource_aws_codedeploy_deployment_config.go +++ b/aws/resource_aws_codedeploy_deployment_config.go @@ -95,7 +95,7 @@ func resourceAwsCodeDeployDeploymentConfigRead(d *schema.ResourceData, meta inte } if resp.DeploymentConfigInfo == nil { - return fmt.Errorf("[ERROR] Cannot find DeploymentConfig %q", d.Id()) + return fmt.Errorf("Cannot find DeploymentConfig %q", d.Id()) } if err := d.Set("minimum_healthy_hosts", flattenAwsCodeDeployConfigMinimumHealthHosts(resp.DeploymentConfigInfo.MinimumHealthyHosts)); err != nil { diff --git a/aws/resource_aws_codepipeline.go b/aws/resource_aws_codepipeline.go index b9148fff8c6..fd1481c0f45 100644 --- a/aws/resource_aws_codepipeline.go +++ b/aws/resource_aws_codepipeline.go @@ -193,10 +193,10 @@ func resourceAwsCodePipelineCreate(d *schema.ResourceData, meta interface{}) err return resource.NonRetryableError(err) }) if err != nil { - return fmt.Errorf("[ERROR] Error creating CodePipeline: %s", err) + return fmt.Errorf("Error creating CodePipeline: %s", err) } if resp.Pipeline == nil { - return fmt.Errorf("[ERROR] Error creating CodePipeline: invalid response from AWS") + return fmt.Errorf("Error creating CodePipeline: invalid response from AWS") } d.SetId(*resp.Pipeline.Name) @@ -440,7 +440,7 @@ func resourceAwsCodePipelineRead(d *schema.ResourceData, meta interface{}) error d.SetId("") return nil } - return fmt.Errorf("[ERROR] Error retreiving Pipeline: %q", err) + return fmt.Errorf("Error retreiving Pipeline: %q", err) } metadata := resp.Metadata pipeline := resp.Pipeline diff --git a/aws/resource_aws_cognito_identity_pool.go b/aws/resource_aws_cognito_identity_pool.go index 8730192c9a1..bc043d111c9 100644 --- a/aws/resource_aws_cognito_identity_pool.go +++ b/aws/resource_aws_cognito_identity_pool.go @@ -170,19 +170,19 @@ func resourceAwsCognitoIdentityPoolRead(d *schema.ResourceData, meta interface{} d.Set("developer_provider_name", ip.DeveloperProviderName) if err := d.Set("cognito_identity_providers", flattenCognitoIdentityProviders(ip.CognitoIdentityProviders)); err != nil { - return fmt.Errorf("[DEBUG] Error setting cognito_identity_providers error: %#v", err) + return fmt.Errorf("Error setting cognito_identity_providers error: %#v", err) } if err := d.Set("openid_connect_provider_arns", flattenStringList(ip.OpenIdConnectProviderARNs)); err != nil { - return fmt.Errorf("[DEBUG] Error setting openid_connect_provider_arns error: %#v", err) + return fmt.Errorf("Error setting openid_connect_provider_arns error: %#v", err) } if err := d.Set("saml_provider_arns", flattenStringList(ip.SamlProviderARNs)); err != nil { - return fmt.Errorf("[DEBUG] Error setting saml_provider_arns error: %#v", err) + return fmt.Errorf("Error setting saml_provider_arns error: %#v", err) } if err := d.Set("supported_login_providers", flattenCognitoSupportedLoginProviders(ip.SupportedLoginProviders)); err != nil { - return fmt.Errorf("[DEBUG] Error setting supported_login_providers error: %#v", err) + return fmt.Errorf("Error setting supported_login_providers error: %#v", err) } return nil diff --git a/aws/resource_aws_cognito_identity_pool_roles_attachment.go b/aws/resource_aws_cognito_identity_pool_roles_attachment.go index 5e1f5324d9c..2212afda473 100644 --- a/aws/resource_aws_cognito_identity_pool_roles_attachment.go +++ b/aws/resource_aws_cognito_identity_pool_roles_attachment.go @@ -168,11 +168,11 @@ func resourceAwsCognitoIdentityPoolRolesAttachmentRead(d *schema.ResourceData, m } if err := d.Set("roles", flattenCognitoIdentityPoolRoles(ip.Roles)); err != nil { - return fmt.Errorf("[DEBUG] Error setting roles error: %#v", err) + return fmt.Errorf("Error setting roles error: %#v", err) } if err := d.Set("role_mapping", flattenCognitoIdentityPoolRoleMappingsAttachment(ip.RoleMappings)); err != nil { - return fmt.Errorf("[DEBUG] Error setting role mappings error: %#v", err) + return fmt.Errorf("Error setting role mappings error: %#v", err) } return nil diff --git a/aws/resource_aws_cognito_user_pool.go b/aws/resource_aws_cognito_user_pool.go index 075e43e0d02..33c417f1238 100644 --- a/aws/resource_aws_cognito_user_pool.go +++ b/aws/resource_aws_cognito_user_pool.go @@ -9,7 +9,6 @@ import ( "github.com/aws/aws-sdk-go/aws/arn" "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/service/cognitoidentityprovider" - "github.com/hashicorp/errwrap" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/validation" @@ -617,7 +616,7 @@ func resourceAwsCognitoUserPoolCreate(d *schema.ResourceData, meta interface{}) return resource.NonRetryableError(err) }) if err != nil { - return errwrap.Wrapf("Error creating Cognito User Pool: {{err}}", err) + return fmt.Errorf("Error creating Cognito User Pool: %s", err) } d.SetId(*resp.UserPool.Id) @@ -862,7 +861,7 @@ func resourceAwsCognitoUserPoolUpdate(d *schema.ResourceData, meta interface{}) return resource.NonRetryableError(err) }) if err != nil { - return errwrap.Wrapf("Error updating Cognito User pool: {{err}}", err) + return fmt.Errorf("Error updating Cognito User pool: %s", err) } return resourceAwsCognitoUserPoolRead(d, meta) @@ -880,7 +879,7 @@ func resourceAwsCognitoUserPoolDelete(d *schema.ResourceData, meta interface{}) _, err := conn.DeleteUserPool(params) if err != nil { - return errwrap.Wrapf("Error deleting user pool: {{err}}", err) + return fmt.Errorf("Error deleting user pool: %s", err) } return nil diff --git a/aws/resource_aws_cognito_user_pool_client.go b/aws/resource_aws_cognito_user_pool_client.go index f589e973b5d..e4a3ae596e2 100644 --- a/aws/resource_aws_cognito_user_pool_client.go +++ b/aws/resource_aws_cognito_user_pool_client.go @@ -7,7 +7,6 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/cognitoidentityprovider" - "github.com/hashicorp/errwrap" "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/validation" ) @@ -214,7 +213,7 @@ func resourceAwsCognitoUserPoolClientCreate(d *schema.ResourceData, meta interfa resp, err := conn.CreateUserPoolClient(params) if err != nil { - return errwrap.Wrapf("Error creating Cognito User Pool Client: {{err}}", err) + return fmt.Errorf("Error creating Cognito User Pool Client: %s", err) } d.SetId(*resp.UserPoolClient.ClientId) @@ -318,7 +317,7 @@ func resourceAwsCognitoUserPoolClientUpdate(d *schema.ResourceData, meta interfa _, err := conn.UpdateUserPoolClient(params) if err != nil { - return errwrap.Wrapf("Error updating Cognito User Pool Client: {{err}}", err) + return fmt.Errorf("Error updating Cognito User Pool Client: %s", err) } return resourceAwsCognitoUserPoolClientRead(d, meta) @@ -337,7 +336,7 @@ func resourceAwsCognitoUserPoolClientDelete(d *schema.ResourceData, meta interfa _, err := conn.DeleteUserPoolClient(params) if err != nil { - return errwrap.Wrapf("Error deleting Cognito User Pool Client: {{err}}", err) + return fmt.Errorf("Error deleting Cognito User Pool Client: %s", err) } return nil @@ -345,7 +344,7 @@ func resourceAwsCognitoUserPoolClientDelete(d *schema.ResourceData, meta interfa func resourceAwsCognitoUserPoolClientImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { if len(strings.Split(d.Id(), "/")) != 2 || len(d.Id()) < 3 { - return []*schema.ResourceData{}, fmt.Errorf("[ERR] Wrong format of resource: %s. Please follow 'user-pool-id/client-id'", d.Id()) + return []*schema.ResourceData{}, fmt.Errorf("Wrong format of resource: %s. Please follow 'user-pool-id/client-id'", d.Id()) } userPoolId := strings.Split(d.Id(), "/")[0] clientId := strings.Split(d.Id(), "/")[1] diff --git a/aws/resource_aws_customer_gateway.go b/aws/resource_aws_customer_gateway.go index 7e5dda3b0bc..8c54bd8927e 100644 --- a/aws/resource_aws_customer_gateway.go +++ b/aws/resource_aws_customer_gateway.go @@ -189,7 +189,7 @@ func resourceAwsCustomerGatewayRead(d *schema.ResourceData, meta interface{}) er } if len(resp.CustomerGateways) != 1 { - return fmt.Errorf("[ERROR] Error finding CustomerGateway: %s", d.Id()) + return fmt.Errorf("Error finding CustomerGateway: %s", d.Id()) } if *resp.CustomerGateways[0].State == "deleted" { @@ -261,16 +261,16 @@ func resourceAwsCustomerGatewayDelete(d *schema.ResourceData, meta interface{}) } if len(resp.CustomerGateways) != 1 { - return resource.RetryableError(fmt.Errorf("[ERROR] Error finding CustomerGateway for delete: %s", d.Id())) + return resource.RetryableError(fmt.Errorf("Error finding CustomerGateway for delete: %s", d.Id())) } switch *resp.CustomerGateways[0].State { case "pending", "available", "deleting": - return resource.RetryableError(fmt.Errorf("[DEBUG] Gateway (%s) in state (%s), retrying", d.Id(), *resp.CustomerGateways[0].State)) + return resource.RetryableError(fmt.Errorf("Gateway (%s) in state (%s), retrying", d.Id(), *resp.CustomerGateways[0].State)) case "deleted": return nil default: - return resource.RetryableError(fmt.Errorf("[DEBUG] Unrecognized state (%s) for Customer Gateway delete on (%s)", *resp.CustomerGateways[0].State, d.Id())) + return resource.RetryableError(fmt.Errorf("Unrecognized state (%s) for Customer Gateway delete on (%s)", *resp.CustomerGateways[0].State, d.Id())) } }) diff --git a/aws/resource_aws_dax_cluster.go b/aws/resource_aws_dax_cluster.go index f83f37d3e45..87ce086c14f 100644 --- a/aws/resource_aws_dax_cluster.go +++ b/aws/resource_aws_dax_cluster.go @@ -385,7 +385,7 @@ func resourceAwsDaxClusterUpdate(d *schema.ResourceData, meta interface{}) error log.Printf("[DEBUG] Modifying DAX Cluster (%s), opts:\n%s", d.Id(), req) _, err := conn.UpdateCluster(req) if err != nil { - return fmt.Errorf("[WARN] Error updating DAX cluster (%s), error: %s", d.Id(), err) + return fmt.Errorf("Error updating DAX cluster (%s), error: %s", d.Id(), err) } awaitUpdate = true } @@ -401,7 +401,7 @@ func resourceAwsDaxClusterUpdate(d *schema.ResourceData, meta interface{}) error NewReplicationFactor: aws.Int64(int64(nraw.(int))), }) if err != nil { - return fmt.Errorf("[WARN] Error increasing nodes in DAX cluster %s, error: %s", d.Id(), err) + return fmt.Errorf("Error increasing nodes in DAX cluster %s, error: %s", d.Id(), err) } awaitUpdate = true } @@ -412,7 +412,7 @@ func resourceAwsDaxClusterUpdate(d *schema.ResourceData, meta interface{}) error NewReplicationFactor: aws.Int64(int64(nraw.(int))), }) if err != nil { - return fmt.Errorf("[WARN] Error increasing nodes in DAX cluster %s, error: %s", d.Id(), err) + return fmt.Errorf("Error increasing nodes in DAX cluster %s, error: %s", d.Id(), err) } awaitUpdate = true } @@ -524,7 +524,7 @@ func daxClusterStateRefreshFunc(conn *dax.DAX, clusterID, givenState string, pen } if len(resp.Clusters) == 0 { - return nil, "", fmt.Errorf("[WARN] Error: no DAX clusters found for id (%s)", clusterID) + return nil, "", fmt.Errorf("Error: no DAX clusters found for id (%s)", clusterID) } var c *dax.Cluster @@ -536,7 +536,7 @@ func daxClusterStateRefreshFunc(conn *dax.DAX, clusterID, givenState string, pen } if c == nil { - return nil, "", fmt.Errorf("[WARN] Error: no matching DAX cluster for id (%s)", clusterID) + return nil, "", fmt.Errorf("Error: no matching DAX cluster for id (%s)", clusterID) } // DescribeCluster returns a response without status late on in the diff --git a/aws/resource_aws_db_instance.go b/aws/resource_aws_db_instance.go index fc3a25947fc..ec1577e4951 100644 --- a/aws/resource_aws_db_instance.go +++ b/aws/resource_aws_db_instance.go @@ -1230,7 +1230,7 @@ func resourceAwsDbInstanceRead(d *schema.ResourceData, meta interface{}) error { replicas = append(replicas, *v) } if err := d.Set("replicas", replicas); err != nil { - return fmt.Errorf("[DEBUG] Error setting replicas attribute: %#v, error: %#v", replicas, err) + return fmt.Errorf("Error setting replicas attribute: %#v, error: %#v", replicas, err) } d.Set("replicate_source_db", v.ReadReplicaSourceDBInstanceIdentifier) diff --git a/aws/resource_aws_default_network_acl.go b/aws/resource_aws_default_network_acl.go index 138de0176bb..16b4ae0c41f 100644 --- a/aws/resource_aws_default_network_acl.go +++ b/aws/resource_aws_default_network_acl.go @@ -261,7 +261,7 @@ func revokeAllNetworkACLEntries(netaclId string, meta interface{}) error { } if resp == nil { - return fmt.Errorf("[ERR] Error looking up Default Network ACL Entries: No results") + return fmt.Errorf("Error looking up Default Network ACL Entries: No results") } networkAcl := resp.NetworkAcls[0] diff --git a/aws/resource_aws_default_security_group.go b/aws/resource_aws_default_security_group.go index 15e9e3a5719..0b3af038a6c 100644 --- a/aws/resource_aws_default_security_group.go +++ b/aws/resource_aws_default_security_group.go @@ -6,7 +6,6 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/hashicorp/errwrap" "github.com/hashicorp/terraform/helper/schema" ) @@ -67,7 +66,7 @@ func resourceAwsDefaultSecurityGroupCreate(d *schema.ResourceData, meta interfac // returned, as default is a protected name for each VPC, and for each // Region on EC2 Classic if len(resp.SecurityGroups) != 1 { - return fmt.Errorf("[ERR] Error finding default security group; found (%d) groups: %s", len(resp.SecurityGroups), resp) + return fmt.Errorf("Error finding default security group; found (%d) groups: %s", len(resp.SecurityGroups), resp) } g = resp.SecurityGroups[0] } else { @@ -81,7 +80,7 @@ func resourceAwsDefaultSecurityGroupCreate(d *schema.ResourceData, meta interfac } if g == nil { - return fmt.Errorf("[ERR] Error finding default security group: no matching group found") + return fmt.Errorf("Error finding default security group: no matching group found") } d.SetId(*g.GroupId) @@ -93,7 +92,7 @@ func resourceAwsDefaultSecurityGroupCreate(d *schema.ResourceData, meta interfac } if err := revokeDefaultSecurityGroupRules(meta, g); err != nil { - return errwrap.Wrapf("{{err}}", err) + return fmt.Errorf("%s", err) } return resourceAwsSecurityGroupUpdate(d, meta) diff --git a/aws/resource_aws_dms_replication_task.go b/aws/resource_aws_dms_replication_task.go index 49bab71fa50..d44b30c81eb 100644 --- a/aws/resource_aws_dms_replication_task.go +++ b/aws/resource_aws_dms_replication_task.go @@ -104,7 +104,7 @@ func resourceAwsDmsReplicationTaskCreate(d *schema.ResourceData, meta interface{ if v, ok := d.GetOk("cdc_start_time"); ok { seconds, err := strconv.ParseInt(v.(string), 10, 64) if err != nil { - return fmt.Errorf("[ERROR] DMS create replication task. Invalid CDC Unix timestamp: %s", err) + return fmt.Errorf("DMS create replication task. Invalid CDC Unix timestamp: %s", err) } request.CdcStartTime = aws.Time(time.Unix(seconds, 0)) } @@ -188,7 +188,7 @@ func resourceAwsDmsReplicationTaskUpdate(d *schema.ResourceData, meta interface{ if d.HasChange("cdc_start_time") { seconds, err := strconv.ParseInt(d.Get("cdc_start_time").(string), 10, 64) if err != nil { - return fmt.Errorf("[ERROR] DMS update replication task. Invalid CRC Unix timestamp: %s", err) + return fmt.Errorf("DMS update replication task. Invalid CRC Unix timestamp: %s", err) } request.CdcStartTime = aws.Time(time.Unix(seconds, 0)) hasChanges = true diff --git a/aws/resource_aws_dx_connection.go b/aws/resource_aws_dx_connection.go index 5e91e919ba7..82e2718eefd 100644 --- a/aws/resource_aws_dx_connection.go +++ b/aws/resource_aws_dx_connection.go @@ -88,11 +88,11 @@ func resourceAwsDxConnectionRead(d *schema.ResourceData, meta interface{}) error return nil } if len(resp.Connections) != 1 { - return fmt.Errorf("[ERROR] Number of Direct Connect connections (%s) isn't one, got %d", d.Id(), len(resp.Connections)) + return fmt.Errorf("Number of Direct Connect connections (%s) isn't one, got %d", d.Id(), len(resp.Connections)) } connection := resp.Connections[0] if d.Id() != aws.StringValue(connection.ConnectionId) { - return fmt.Errorf("[ERROR] Direct Connect connection (%s) not found", d.Id()) + return fmt.Errorf("Direct Connect connection (%s) not found", d.Id()) } if aws.StringValue(connection.ConnectionState) == directconnect.ConnectionStateDeleted { log.Printf("[WARN] Direct Connect connection (%s) not found, removing from state", d.Id()) diff --git a/aws/resource_aws_dx_lag.go b/aws/resource_aws_dx_lag.go index 6c0fbb2524d..14e3b9a3823 100644 --- a/aws/resource_aws_dx_lag.go +++ b/aws/resource_aws_dx_lag.go @@ -111,11 +111,11 @@ func resourceAwsDxLagRead(d *schema.ResourceData, meta interface{}) error { return nil } if len(resp.Lags) != 1 { - return fmt.Errorf("[ERROR] Number of Direct Connect LAGs (%s) isn't one, got %d", d.Id(), len(resp.Lags)) + return fmt.Errorf("Number of Direct Connect LAGs (%s) isn't one, got %d", d.Id(), len(resp.Lags)) } lag := resp.Lags[0] if d.Id() != aws.StringValue(lag.LagId) { - return fmt.Errorf("[ERROR] Direct Connect LAG (%s) not found", d.Id()) + return fmt.Errorf("Direct Connect LAG (%s) not found", d.Id()) } if aws.StringValue(lag.LagState) == directconnect.LagStateDeleted { diff --git a/aws/resource_aws_dynamodb_table_item_test.go b/aws/resource_aws_dynamodb_table_item_test.go index acbb03644a9..1c493abe61c 100644 --- a/aws/resource_aws_dynamodb_table_item_test.go +++ b/aws/resource_aws_dynamodb_table_item_test.go @@ -290,7 +290,7 @@ func testAccCheckAWSDynamoDbTableItemExists(n string, item *dynamodb.GetItemOutp ExpressionAttributeNames: buildDynamoDbExpressionAttributeNames(attributes), }) if err != nil { - return fmt.Errorf("[ERROR] Problem getting table item '%s': %s", rs.Primary.ID, err) + return fmt.Errorf("Problem getting table item '%s': %s", rs.Primary.ID, err) } *item = *result diff --git a/aws/resource_aws_dynamodb_table_migrate.go b/aws/resource_aws_dynamodb_table_migrate.go index 59865effc89..29eb38de472 100644 --- a/aws/resource_aws_dynamodb_table_migrate.go +++ b/aws/resource_aws_dynamodb_table_migrate.go @@ -3,10 +3,10 @@ package aws import ( "fmt" "log" + "strings" "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/terraform" - "strings" ) func resourceAwsDynamoDbTableMigrateState( diff --git a/aws/resource_aws_dynamodb_table_test.go b/aws/resource_aws_dynamodb_table_test.go index 1ab1e95cdc7..316fd0d7168 100644 --- a/aws/resource_aws_dynamodb_table_test.go +++ b/aws/resource_aws_dynamodb_table_test.go @@ -769,7 +769,7 @@ func testAccCheckDynamoDbTableTimeToLiveWasUpdated(n string) resource.TestCheckF resp, err := conn.DescribeTimeToLive(params) if err != nil { - return fmt.Errorf("[ERROR] Problem describing time to live for table '%s': %s", rs.Primary.ID, err) + return fmt.Errorf("Problem describing time to live for table '%s': %s", rs.Primary.ID, err) } ttlDescription := resp.TimeToLiveDescription @@ -813,7 +813,7 @@ func TestAccAWSDynamoDbTable_encryption(t *testing.T) { resource.TestCheckResourceAttr("aws_dynamodb_table.basic-dynamodb-table", "server_side_encryption.#", "0"), func(s *terraform.State) error { if confEncDisabled.Table.CreationDateTime.Equal(*confEncEnabled.Table.CreationDateTime) { - return fmt.Errorf("[ERROR] DynamoDB table not recreated when changing SSE") + return fmt.Errorf("DynamoDB table not recreated when changing SSE") } return nil }, @@ -826,7 +826,7 @@ func TestAccAWSDynamoDbTable_encryption(t *testing.T) { resource.TestCheckResourceAttr("aws_dynamodb_table.basic-dynamodb-table", "server_side_encryption.#", "0"), func(s *terraform.State) error { if !confBasic.Table.CreationDateTime.Equal(*confEncDisabled.Table.CreationDateTime) { - return fmt.Errorf("[ERROR] DynamoDB table was recreated unexpectedly") + return fmt.Errorf("DynamoDB table was recreated unexpectedly") } return nil }, @@ -887,7 +887,7 @@ func testAccCheckInitialAWSDynamoDbTableExists(n string, table *dynamodb.Describ resp, err := conn.DescribeTable(params) if err != nil { - return fmt.Errorf("[ERROR] Problem describing table '%s': %s", rs.Primary.ID, err) + return fmt.Errorf("Problem describing table '%s': %s", rs.Primary.ID, err) } *table = *resp @@ -917,7 +917,7 @@ func testAccCheckInitialAWSDynamoDbTableConf(n string) resource.TestCheckFunc { resp, err := conn.DescribeTable(params) if err != nil { - return fmt.Errorf("[ERROR] Problem describing table '%s': %s", rs.Primary.ID, err) + return fmt.Errorf("Problem describing table '%s': %s", rs.Primary.ID, err) } table := resp.Table diff --git a/aws/resource_aws_ebs_volume.go b/aws/resource_aws_ebs_volume.go index 6b8d59775d1..1d37720b608 100644 --- a/aws/resource_aws_ebs_volume.go +++ b/aws/resource_aws_ebs_volume.go @@ -10,7 +10,6 @@ import ( "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/hashicorp/errwrap" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" ) @@ -141,7 +140,7 @@ func resourceAwsEbsVolumeCreate(d *schema.ResourceData, meta interface{}) error if _, ok := d.GetOk("tags"); ok { if err := setTags(conn, d); err != nil { - return errwrap.Wrapf("Error setting tags for EBS Volume: {{err}}", err) + return fmt.Errorf("Error setting tags for EBS Volume: %s", err) } } @@ -152,7 +151,7 @@ func resourceAWSEbsVolumeUpdate(d *schema.ResourceData, meta interface{}) error conn := meta.(*AWSClient).ec2conn if _, ok := d.GetOk("tags"); ok { if err := setTags(conn, d); err != nil { - return errwrap.Wrapf("Error updating tags for EBS Volume: {{err}}", err) + return fmt.Errorf("Error updating tags for EBS Volume: %s", err) } } diff --git a/aws/resource_aws_ecs_service.go b/aws/resource_aws_ecs_service.go index a8050269baa..1dcaba31b7b 100644 --- a/aws/resource_aws_ecs_service.go +++ b/aws/resource_aws_ecs_service.go @@ -306,7 +306,7 @@ func resourceAwsEcsService() *schema.Resource { func resourceAwsEcsServiceImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { if len(strings.Split(d.Id(), "/")) != 2 { - return []*schema.ResourceData{}, fmt.Errorf("[ERR] Wrong format of resource: %s. Please follow 'cluster-name/service-name'", d.Id()) + return []*schema.ResourceData{}, fmt.Errorf("Wrong format of resource: %s. Please follow 'cluster-name/service-name'", d.Id()) } cluster := strings.Split(d.Id(), "/")[0] name := strings.Split(d.Id(), "/")[1] @@ -575,11 +575,11 @@ func resourceAwsEcsServiceRead(d *schema.ResourceData, meta interface{}) error { } if err := d.Set("network_configuration", flattenEcsNetworkConfiguration(service.NetworkConfiguration)); err != nil { - return fmt.Errorf("[ERR] Error setting network_configuration for (%s): %s", d.Id(), err) + return fmt.Errorf("Error setting network_configuration for (%s): %s", d.Id(), err) } if err := d.Set("service_registries", flattenServiceRegistries(service.ServiceRegistries)); err != nil { - return fmt.Errorf("[ERR] Error setting service_registries for (%s): %s", d.Id(), err) + return fmt.Errorf("Error setting service_registries for (%s): %s", d.Id(), err) } return nil diff --git a/aws/resource_aws_egress_only_internet_gateway.go b/aws/resource_aws_egress_only_internet_gateway.go index 0d5256a1594..4954acbd6e3 100644 --- a/aws/resource_aws_egress_only_internet_gateway.go +++ b/aws/resource_aws_egress_only_internet_gateway.go @@ -8,7 +8,6 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/hashicorp/errwrap" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" ) @@ -54,7 +53,7 @@ func resourceAwsEgressOnlyInternetGatewayCreate(d *schema.ResourceData, meta int }) if err != nil { - return errwrap.Wrapf("{{err}}", err) + return fmt.Errorf("%s", err) } return resourceAwsEgressOnlyInternetGatewayRead(d, meta) diff --git a/aws/resource_aws_elastic_beanstalk_environment.go b/aws/resource_aws_elastic_beanstalk_environment.go index 796ece82f12..1a556fdd984 100644 --- a/aws/resource_aws_elastic_beanstalk_environment.go +++ b/aws/resource_aws_elastic_beanstalk_environment.go @@ -803,7 +803,7 @@ func environmentStateRefreshFunc(conn *elasticbeanstalk.ElasticBeanstalk, enviro }) if err != nil { log.Printf("[Err] Error waiting for Elastic Beanstalk Environment state: %s", err) - return -1, "failed", fmt.Errorf("[Err] Error waiting for Elastic Beanstalk Environment state: %s", err) + return -1, "failed", fmt.Errorf("Error waiting for Elastic Beanstalk Environment state: %s", err) } if resp == nil || len(resp.Environments) == 0 { @@ -820,7 +820,7 @@ func environmentStateRefreshFunc(conn *elasticbeanstalk.ElasticBeanstalk, enviro } if env == nil { - return -1, "failed", fmt.Errorf("[Err] Error finding Elastic Beanstalk Environment, environment not found") + return -1, "failed", fmt.Errorf("Error finding Elastic Beanstalk Environment, environment not found") } envErrors, err := getBeanstalkEnvironmentErrors(conn, environmentId, t) @@ -968,7 +968,7 @@ func getBeanstalkEnvironmentErrors(conn *elasticbeanstalk.ElasticBeanstalk, envi }) if err != nil { - return nil, fmt.Errorf("[Err] Unable to get Elastic Beanstalk Evironment events: %s", err) + return nil, fmt.Errorf("Unable to get Elastic Beanstalk Evironment events: %s", err) } var events beanstalkEnvironmentErrors diff --git a/aws/resource_aws_elastic_transcoder_pipeline.go b/aws/resource_aws_elastic_transcoder_pipeline.go index 6a0d8835282..1d290c925bc 100644 --- a/aws/resource_aws_elastic_transcoder_pipeline.go +++ b/aws/resource_aws_elastic_transcoder_pipeline.go @@ -210,7 +210,7 @@ func resourceAwsElasticTranscoderPipelineCreate(d *schema.ResourceData, meta int if (req.OutputBucket == nil && (req.ContentConfig == nil || req.ContentConfig.Bucket == nil)) || (req.OutputBucket != nil && req.ContentConfig != nil && req.ContentConfig.Bucket != nil) { - return fmt.Errorf("[ERROR] you must specify only one of output_bucket or content_config.bucket") + return fmt.Errorf("you must specify only one of output_bucket or content_config.bucket") } log.Printf("[DEBUG] Elastic Transcoder Pipeline create opts: %s", req) diff --git a/aws/resource_aws_elasticache_cluster.go b/aws/resource_aws_elasticache_cluster.go index a2bea31f45f..2e26ed36a50 100644 --- a/aws/resource_aws_elasticache_cluster.go +++ b/aws/resource_aws_elasticache_cluster.go @@ -628,7 +628,7 @@ func resourceAwsElasticacheClusterUpdate(d *schema.ResourceData, meta interface{ log.Printf("[DEBUG] Modifying ElastiCache Cluster (%s), opts:\n%s", d.Id(), req) _, err := conn.ModifyCacheCluster(req) if err != nil { - return fmt.Errorf("[WARN] Error updating ElastiCache cluster (%s), error: %s", d.Id(), err) + return fmt.Errorf("Error updating ElastiCache cluster (%s), error: %s", d.Id(), err) } log.Printf("[DEBUG] Waiting for update: %s", d.Id()) @@ -727,7 +727,7 @@ func cacheClusterStateRefreshFunc(conn *elasticache.ElastiCache, clusterID, give } if len(resp.CacheClusters) == 0 { - return nil, "", fmt.Errorf("[WARN] Error: no Cache Clusters found for id (%s)", clusterID) + return nil, "", fmt.Errorf("Error: no Cache Clusters found for id (%s)", clusterID) } var c *elasticache.CacheCluster @@ -739,7 +739,7 @@ func cacheClusterStateRefreshFunc(conn *elasticache.ElastiCache, clusterID, give } if c == nil { - return nil, "", fmt.Errorf("[WARN] Error: no matching Elastic Cache cluster for id (%s)", clusterID) + return nil, "", fmt.Errorf("Error: no matching Elastic Cache cluster for id (%s)", clusterID) } log.Printf("[DEBUG] ElastiCache Cluster (%s) status: %v", clusterID, *c.CacheClusterStatus) diff --git a/aws/resource_aws_elasticache_replication_group.go b/aws/resource_aws_elasticache_replication_group.go index af8bee44722..94be844f4a8 100644 --- a/aws/resource_aws_elasticache_replication_group.go +++ b/aws/resource_aws_elasticache_replication_group.go @@ -697,7 +697,7 @@ func cacheReplicationGroupStateRefreshFunc(conn *elasticache.ElastiCache, replic } if len(resp.ReplicationGroups) == 0 { - return nil, "", fmt.Errorf("[WARN] Error: no Cache Replication Groups found for id (%s)", replicationGroupId) + return nil, "", fmt.Errorf("Error: no Cache Replication Groups found for id (%s)", replicationGroupId) } var rg *elasticache.ReplicationGroup @@ -709,7 +709,7 @@ func cacheReplicationGroupStateRefreshFunc(conn *elasticache.ElastiCache, replic } if rg == nil { - return nil, "", fmt.Errorf("[WARN] Error: no matching ElastiCache Replication Group for id (%s)", replicationGroupId) + return nil, "", fmt.Errorf("Error: no matching ElastiCache Replication Group for id (%s)", replicationGroupId) } log.Printf("[DEBUG] ElastiCache Replication Group (%s) status: %v", replicationGroupId, *rg.Status) diff --git a/aws/resource_aws_elasticsearch_domain.go b/aws/resource_aws_elasticsearch_domain.go index e2f59082ddd..1ea5d7877e6 100644 --- a/aws/resource_aws_elasticsearch_domain.go +++ b/aws/resource_aws_elasticsearch_domain.go @@ -11,7 +11,6 @@ import ( "github.com/aws/aws-sdk-go/aws/awserr" elasticsearch "github.com/aws/aws-sdk-go/service/elasticsearchservice" "github.com/aws/aws-sdk-go/service/iam" - "github.com/hashicorp/errwrap" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/structure" @@ -526,7 +525,7 @@ func resourceAwsElasticSearchDomainRead(d *schema.ResourceData, meta interface{} if ds.AccessPolicies != nil && aws.StringValue(ds.AccessPolicies) != "" { policies, err := structure.NormalizeJsonString(aws.StringValue(ds.AccessPolicies)) if err != nil { - return errwrap.Wrapf("access policies contain an invalid JSON: {{err}}", err) + return fmt.Errorf("access policies contain an invalid JSON: %s", err) } d.Set("access_policies", policies) } diff --git a/aws/resource_aws_elb.go b/aws/resource_aws_elb.go index 9ddba075eeb..38ca61e265a 100644 --- a/aws/resource_aws_elb.go +++ b/aws/resource_aws_elb.go @@ -304,7 +304,7 @@ func resourceAwsElbCreate(d *schema.ResourceData, meta interface{}) error { // Check for IAM SSL Cert error, eventual consistancy issue if awsErr.Code() == "CertificateNotFound" { return resource.RetryableError( - fmt.Errorf("[WARN] Error creating ELB Listener with SSL Cert, retrying: %s", err)) + fmt.Errorf("Error creating ELB Listener with SSL Cert, retrying: %s", err)) } } return resource.NonRetryableError(err) @@ -407,7 +407,7 @@ func flattenAwsELbResource(d *schema.ResourceData, ec2conn *ec2.EC2, elbconn *el elbVpc = *lb.VPCId sgId, err := sourceSGIdByName(ec2conn, *lb.SourceSecurityGroup.GroupName, elbVpc) if err != nil { - return fmt.Errorf("[WARN] Error looking up ELB Security Group ID: %s", err) + return fmt.Errorf("Error looking up ELB Security Group ID: %s", err) } else { d.Set("source_security_group_id", sgId) } diff --git a/aws/resource_aws_emr_cluster.go b/aws/resource_aws_emr_cluster.go index a2d6142763e..4b74d5adbdf 100644 --- a/aws/resource_aws_emr_cluster.go +++ b/aws/resource_aws_emr_cluster.go @@ -615,7 +615,7 @@ func resourceAwsEMRClusterCreate(d *schema.ResourceData, meta interface{}) error _, err = stateConf.WaitForState() if err != nil { - return fmt.Errorf("[WARN] Error waiting for EMR Cluster state to be \"WAITING\" or \"RUNNING\": %s", err) + return fmt.Errorf("Error waiting for EMR Cluster state to be \"WAITING\" or \"RUNNING\": %s", err) } return resourceAwsEMRClusterRead(d, meta) @@ -767,7 +767,7 @@ func resourceAwsEMRClusterUpdate(d *schema.ResourceData, meta interface{}) error coreInstanceCount := d.Get("core_instance_count").(int) coreGroup := findGroup(groups, "CORE") if coreGroup == nil { - return fmt.Errorf("[ERR] Error finding core group") + return fmt.Errorf("Error finding core group") } params := &emr.ModifyInstanceGroupsInput{ @@ -805,7 +805,7 @@ func resourceAwsEMRClusterUpdate(d *schema.ResourceData, meta interface{}) error _, err = stateConf.WaitForState() if err != nil { - return fmt.Errorf("[WARN] Error waiting for EMR Cluster state to be \"WAITING\" or \"RUNNING\" after modification: %s", err) + return fmt.Errorf("Error waiting for EMR Cluster state to be \"WAITING\" or \"RUNNING\" after modification: %s", err) } } @@ -891,7 +891,7 @@ func resourceAwsEMRClusterDelete(d *schema.ResourceData, meta interface{}) error log.Printf("[DEBUG] All (%d) EMR Cluster (%s) Instances terminated", instanceCount, d.Id()) return nil } - return resource.RetryableError(fmt.Errorf("[DEBUG] EMR Cluster (%s) has (%d) Instances remaining, retrying", d.Id(), len(resp.Instances))) + return resource.RetryableError(fmt.Errorf("EMR Cluster (%s) has (%d) Instances remaining, retrying", d.Id(), len(resp.Instances))) }) if err != nil { diff --git a/aws/resource_aws_emr_cluster_test.go b/aws/resource_aws_emr_cluster_test.go index ab60c887da7..4084c559d7d 100644 --- a/aws/resource_aws_emr_cluster_test.go +++ b/aws/resource_aws_emr_cluster_test.go @@ -449,7 +449,7 @@ func testAccCheck_bootstrap_order(cluster *emr.Cluster, argsInts, argsStrings [] resp, err := emrconn.ListBootstrapActions(&req) if err != nil { - return fmt.Errorf("[ERR] Error listing boostrap actions in test: %s", err) + return fmt.Errorf("Error listing boostrap actions in test: %s", err) } // make sure we actually checked something diff --git a/aws/resource_aws_emr_instance_group.go b/aws/resource_aws_emr_instance_group.go index 49a70f355fd..15758e229d2 100644 --- a/aws/resource_aws_emr_instance_group.go +++ b/aws/resource_aws_emr_instance_group.go @@ -198,10 +198,10 @@ func fetchAllEMRInstanceGroups(conn *emr.EMR, clusterId string) ([]*emr.Instance log.Printf("[DEBUG] EMR Cluster Instance Marker: %s", *marker) respGrps, errGrps := conn.ListInstanceGroups(req) if errGrps != nil { - return nil, fmt.Errorf("[ERR] Error reading EMR cluster (%s): %s", clusterId, errGrps) + return nil, fmt.Errorf("Error reading EMR cluster (%s): %s", clusterId, errGrps) } if respGrps == nil { - return nil, fmt.Errorf("[ERR] Error reading EMR Instance Group for cluster (%s)", clusterId) + return nil, fmt.Errorf("Error reading EMR Instance Group for cluster (%s)", clusterId) } if respGrps.InstanceGroups != nil { @@ -215,7 +215,7 @@ func fetchAllEMRInstanceGroups(conn *emr.EMR, clusterId string) ([]*emr.Instance } if len(groups) == 0 { - return nil, fmt.Errorf("[WARN] No instance groups found for EMR Cluster (%s)", clusterId) + return nil, fmt.Errorf("No instance groups found for EMR Cluster (%s)", clusterId) } return groups, nil diff --git a/aws/resource_aws_flow_log.go b/aws/resource_aws_flow_log.go index d979f200af8..e67b5b418f0 100644 --- a/aws/resource_aws_flow_log.go +++ b/aws/resource_aws_flow_log.go @@ -162,7 +162,7 @@ func resourceAwsLogFlowDelete(d *schema.ResourceData, meta interface{}) error { }) if err != nil { - return fmt.Errorf("[WARN] Error deleting Flow Log with ID (%s), error: %s", d.Id(), err) + return fmt.Errorf("Error deleting Flow Log with ID (%s), error: %s", d.Id(), err) } return nil diff --git a/aws/resource_aws_glacier_vault.go b/aws/resource_aws_glacier_vault.go index 55de0a8fd1c..44e97da7bab 100644 --- a/aws/resource_aws_glacier_vault.go +++ b/aws/resource_aws_glacier_vault.go @@ -6,7 +6,6 @@ import ( "log" "regexp" - "github.com/hashicorp/errwrap" "github.com/hashicorp/terraform/helper/schema" "github.com/aws/aws-sdk-go/aws" @@ -167,7 +166,7 @@ func resourceAwsGlacierVaultRead(d *schema.ResourceData, meta interface{}) error } else if pol != nil { policy, err := structure.NormalizeJsonString(*pol.Policy.Policy) if err != nil { - return errwrap.Wrapf("access policy contains an invalid JSON: {{err}}", err) + return fmt.Errorf("access policy contains an invalid JSON: %s", err) } d.Set("access_policy", policy) } else { diff --git a/aws/resource_aws_guardduty_ipset.go b/aws/resource_aws_guardduty_ipset.go index 6627936b679..b6e0ab64c8d 100644 --- a/aws/resource_aws_guardduty_ipset.go +++ b/aws/resource_aws_guardduty_ipset.go @@ -86,7 +86,7 @@ func resourceAwsGuardDutyIpsetCreate(d *schema.ResourceData, meta interface{}) e _, err = stateConf.WaitForState() if err != nil { - return fmt.Errorf("[WARN] Error waiting for GuardDuty IpSet status to be \"%s\" or \"%s\": %s", guardduty.IpSetStatusActive, guardduty.IpSetStatusInactive, err) + return fmt.Errorf("Error waiting for GuardDuty IpSet status to be \"%s\" or \"%s\": %s", guardduty.IpSetStatusActive, guardduty.IpSetStatusInactive, err) } d.SetId(fmt.Sprintf("%s:%s", detectorID, *resp.IpSetId)) @@ -186,7 +186,7 @@ func resourceAwsGuardDutyIpsetDelete(d *schema.ResourceData, meta interface{}) e _, err = stateConf.WaitForState() if err != nil { - return fmt.Errorf("[WARN] Error waiting for GuardDuty IpSet status to be \"%s\": %s", guardduty.IpSetStatusDeleted, err) + return fmt.Errorf("Error waiting for GuardDuty IpSet status to be \"%s\": %s", guardduty.IpSetStatusDeleted, err) } return nil diff --git a/aws/resource_aws_guardduty_threatintelset.go b/aws/resource_aws_guardduty_threatintelset.go index 16351a51ee1..75622cef5b7 100644 --- a/aws/resource_aws_guardduty_threatintelset.go +++ b/aws/resource_aws_guardduty_threatintelset.go @@ -86,7 +86,7 @@ func resourceAwsGuardDutyThreatintelsetCreate(d *schema.ResourceData, meta inter _, err = stateConf.WaitForState() if err != nil { - return fmt.Errorf("[WARN] Error waiting for GuardDuty ThreatIntelSet status to be \"%s\" or \"%s\": %s", + return fmt.Errorf("Error waiting for GuardDuty ThreatIntelSet status to be \"%s\" or \"%s\": %s", guardduty.ThreatIntelSetStatusActive, guardduty.ThreatIntelSetStatusInactive, err) } @@ -187,7 +187,7 @@ func resourceAwsGuardDutyThreatintelsetDelete(d *schema.ResourceData, meta inter _, err = stateConf.WaitForState() if err != nil { - return fmt.Errorf("[WARN] Error waiting for GuardDuty ThreatIntelSet status to be \"%s\": %s", guardduty.ThreatIntelSetStatusDeleted, err) + return fmt.Errorf("Error waiting for GuardDuty ThreatIntelSet status to be \"%s\": %s", guardduty.ThreatIntelSetStatusDeleted, err) } return nil diff --git a/aws/resource_aws_iam_access_key.go b/aws/resource_aws_iam_access_key.go index 16a42213c6f..2f9cb681f56 100644 --- a/aws/resource_aws_iam_access_key.go +++ b/aws/resource_aws_iam_access_key.go @@ -75,7 +75,7 @@ func resourceAwsIamAccessKeyCreate(d *schema.ResourceData, meta interface{}) err d.SetId(*createResp.AccessKey.AccessKeyId) if createResp.AccessKey == nil || createResp.AccessKey.SecretAccessKey == nil { - return fmt.Errorf("[ERR] CreateAccessKey response did not contain a Secret Access Key as expected") + return fmt.Errorf("CreateAccessKey response did not contain a Secret Access Key as expected") } if v, ok := d.GetOk("pgp_key"); ok { diff --git a/aws/resource_aws_iam_group_membership.go b/aws/resource_aws_iam_group_membership.go index 4b735d650b6..34a8f0b271a 100644 --- a/aws/resource_aws_iam_group_membership.go +++ b/aws/resource_aws_iam_group_membership.go @@ -88,7 +88,7 @@ func resourceAwsIamGroupMembershipRead(d *schema.ResourceData, meta interface{}) } if err := d.Set("users", ul); err != nil { - return fmt.Errorf("[WARN] Error setting user list from IAM Group Membership (%s), error: %s", group, err) + return fmt.Errorf("Error setting user list from IAM Group Membership (%s), error: %s", group, err) } return nil diff --git a/aws/resource_aws_iam_group_policy_attachment.go b/aws/resource_aws_iam_group_policy_attachment.go index a3526d91bd0..26e620bacee 100644 --- a/aws/resource_aws_iam_group_policy_attachment.go +++ b/aws/resource_aws_iam_group_policy_attachment.go @@ -40,7 +40,7 @@ func resourceAwsIamGroupPolicyAttachmentCreate(d *schema.ResourceData, meta inte err := attachPolicyToGroup(conn, group, arn) if err != nil { - return fmt.Errorf("[WARN] Error attaching policy %s to IAM group %s: %v", arn, group, err) + return fmt.Errorf("Error attaching policy %s to IAM group %s: %v", arn, group, err) } d.SetId(resource.PrefixedUniqueId(fmt.Sprintf("%s-", group))) @@ -96,7 +96,7 @@ func resourceAwsIamGroupPolicyAttachmentDelete(d *schema.ResourceData, meta inte err := detachPolicyFromGroup(conn, group, arn) if err != nil { - return fmt.Errorf("[WARN] Error removing policy %s from IAM Group %s: %v", arn, group, err) + return fmt.Errorf("Error removing policy %s from IAM Group %s: %v", arn, group, err) } return nil } diff --git a/aws/resource_aws_iam_policy_attachment.go b/aws/resource_aws_iam_policy_attachment.go index 219dc20a9b8..9e432f3b546 100644 --- a/aws/resource_aws_iam_policy_attachment.go +++ b/aws/resource_aws_iam_policy_attachment.go @@ -65,7 +65,7 @@ func resourceAwsIamPolicyAttachmentCreate(d *schema.ResourceData, meta interface groups := expandStringList(d.Get("groups").(*schema.Set).List()) if len(users) == 0 && len(roles) == 0 && len(groups) == 0 { - return fmt.Errorf("[WARN] No Users, Roles, or Groups specified for IAM Policy Attachment %s", name) + return fmt.Errorf("No Users, Roles, or Groups specified for IAM Policy Attachment %s", name) } else { var userErr, roleErr, groupErr error if users != nil { diff --git a/aws/resource_aws_iam_role_policy_attachment.go b/aws/resource_aws_iam_role_policy_attachment.go index cea391de976..24ca6901484 100644 --- a/aws/resource_aws_iam_role_policy_attachment.go +++ b/aws/resource_aws_iam_role_policy_attachment.go @@ -40,7 +40,7 @@ func resourceAwsIamRolePolicyAttachmentCreate(d *schema.ResourceData, meta inter err := attachPolicyToRole(conn, role, arn) if err != nil { - return fmt.Errorf("[WARN] Error attaching policy %s to IAM Role %s: %v", arn, role, err) + return fmt.Errorf("Error attaching policy %s to IAM Role %s: %v", arn, role, err) } d.SetId(resource.PrefixedUniqueId(fmt.Sprintf("%s-", role))) @@ -98,7 +98,7 @@ func resourceAwsIamRolePolicyAttachmentDelete(d *schema.ResourceData, meta inter err := detachPolicyFromRole(conn, role, arn) if err != nil { - return fmt.Errorf("[WARN] Error removing policy %s from IAM Role %s: %v", arn, role, err) + return fmt.Errorf("Error removing policy %s from IAM Role %s: %v", arn, role, err) } return nil } diff --git a/aws/resource_aws_iam_server_certificate.go b/aws/resource_aws_iam_server_certificate.go index ed2b963f070..c9c79297ee7 100644 --- a/aws/resource_aws_iam_server_certificate.go +++ b/aws/resource_aws_iam_server_certificate.go @@ -113,9 +113,9 @@ func resourceAwsIAMServerCertificateCreate(d *schema.ResourceData, meta interfac resp, err := conn.UploadServerCertificate(createOpts) if err != nil { if awsErr, ok := err.(awserr.Error); ok { - return fmt.Errorf("[WARN] Error uploading server certificate, error: %s: %s", awsErr.Code(), awsErr.Message()) + return fmt.Errorf("Error uploading server certificate, error: %s: %s", awsErr.Code(), awsErr.Message()) } - return fmt.Errorf("[WARN] Error uploading server certificate, error: %s", err) + return fmt.Errorf("Error uploading server certificate, error: %s", err) } d.SetId(*resp.ServerCertificateMetadata.ServerCertificateId) @@ -137,9 +137,9 @@ func resourceAwsIAMServerCertificateRead(d *schema.ResourceData, meta interface{ d.SetId("") return nil } - return fmt.Errorf("[WARN] Error reading IAM Server Certificate: %s: %s", awsErr.Code(), awsErr.Message()) + return fmt.Errorf("Error reading IAM Server Certificate: %s: %s", awsErr.Code(), awsErr.Message()) } - return fmt.Errorf("[WARN] Error reading IAM Server Certificate: %s", err) + return fmt.Errorf("Error reading IAM Server Certificate: %s", err) } d.SetId(*resp.ServerCertificate.ServerCertificateMetadata.ServerCertificateId) diff --git a/aws/resource_aws_iam_user_group_membership.go b/aws/resource_aws_iam_user_group_membership.go index 83ef39df1f0..e5333a38475 100644 --- a/aws/resource_aws_iam_user_group_membership.go +++ b/aws/resource_aws_iam_user_group_membership.go @@ -86,7 +86,7 @@ func resourceAwsIamUserGroupMembershipRead(d *schema.ResourceData, meta interfac } if err := d.Set("groups", gl); err != nil { - return fmt.Errorf("[WARN] Error setting group list from IAM (%s), error: %s", user, err) + return fmt.Errorf("Error setting group list from IAM (%s), error: %s", user, err) } return nil diff --git a/aws/resource_aws_iam_user_login_profile.go b/aws/resource_aws_iam_user_login_profile.go index 37735ccd0f1..2d680acc017 100644 --- a/aws/resource_aws_iam_user_login_profile.go +++ b/aws/resource_aws_iam_user_login_profile.go @@ -10,7 +10,6 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/service/iam" - "github.com/hashicorp/errwrap" "github.com/hashicorp/terraform/helper/encryption" "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/validation" @@ -166,7 +165,7 @@ func resourceAwsIamUserLoginProfileCreate(d *schema.ResourceData, meta interface d.Set("encrypted_password", "") return nil } - return errwrap.Wrapf(fmt.Sprintf("Error creating IAM User Login Profile for %q: {{err}}", username), err) + return fmt.Errorf("Error creating IAM User Login Profile for %q: %s", username, err) } d.SetId(*createResp.LoginProfile.UserName) diff --git a/aws/resource_aws_iam_user_policy_attachment.go b/aws/resource_aws_iam_user_policy_attachment.go index e0b52c09a47..45bf9b4fe8d 100644 --- a/aws/resource_aws_iam_user_policy_attachment.go +++ b/aws/resource_aws_iam_user_policy_attachment.go @@ -40,7 +40,7 @@ func resourceAwsIamUserPolicyAttachmentCreate(d *schema.ResourceData, meta inter err := attachPolicyToUser(conn, user, arn) if err != nil { - return fmt.Errorf("[WARN] Error attaching policy %s to IAM User %s: %v", arn, user, err) + return fmt.Errorf("Error attaching policy %s to IAM User %s: %v", arn, user, err) } d.SetId(resource.PrefixedUniqueId(fmt.Sprintf("%s-", user))) @@ -95,7 +95,7 @@ func resourceAwsIamUserPolicyAttachmentDelete(d *schema.ResourceData, meta inter err := detachPolicyFromUser(conn, user, arn) if err != nil { - return fmt.Errorf("[WARN] Error removing policy %s from IAM User %s: %v", arn, user, err) + return fmt.Errorf("Error removing policy %s from IAM User %s: %v", arn, user, err) } return nil } diff --git a/aws/resource_aws_instance.go b/aws/resource_aws_instance.go index 8115b461d89..fe3e25563f5 100644 --- a/aws/resource_aws_instance.go +++ b/aws/resource_aws_instance.go @@ -1159,7 +1159,7 @@ func resourceAwsInstanceUpdate(d *schema.ResourceData, meta interface{}) error { }) } if mErr != nil { - return fmt.Errorf("[WARN] Error updating Instance monitoring: %s", mErr) + return fmt.Errorf("Error updating Instance monitoring: %s", mErr) } } @@ -1176,7 +1176,7 @@ func resourceAwsInstanceUpdate(d *schema.ResourceData, meta interface{}) error { }, }) if err != nil { - return fmt.Errorf("[WARN] Error updating Instance credit specification: %s", err) + return fmt.Errorf("Error updating Instance credit specification: %s", err) } } } @@ -1398,7 +1398,7 @@ func fetchRootDeviceName(ami string, conn *ec2.EC2) (*string, error) { } if rootDeviceName == nil { - return nil, fmt.Errorf("[WARN] Error finding Root Device Name for AMI (%s)", ami) + return nil, fmt.Errorf("Error finding Root Device Name for AMI (%s)", ami) } return rootDeviceName, nil diff --git a/aws/resource_aws_internet_gateway.go b/aws/resource_aws_internet_gateway.go index 43c776004a4..7f87e920407 100644 --- a/aws/resource_aws_internet_gateway.go +++ b/aws/resource_aws_internet_gateway.go @@ -8,7 +8,6 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/hashicorp/errwrap" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" ) @@ -62,7 +61,7 @@ func resourceAwsInternetGatewayCreate(d *schema.ResourceData, meta interface{}) }) if err != nil { - return errwrap.Wrapf("{{err}}", err) + return fmt.Errorf("%s", err) } err = setTags(conn, d) diff --git a/aws/resource_aws_iot_policy_test.go b/aws/resource_aws_iot_policy_test.go index 4097a4db061..c159737a8bb 100644 --- a/aws/resource_aws_iot_policy_test.go +++ b/aws/resource_aws_iot_policy_test.go @@ -2,6 +2,7 @@ package aws import ( "fmt" + "regexp" "testing" "github.com/aws/aws-sdk-go/aws" @@ -10,7 +11,6 @@ import ( "github.com/hashicorp/terraform/helper/acctest" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" - "regexp" ) func TestAccAWSIoTPolicy_basic(t *testing.T) { diff --git a/aws/resource_aws_kinesis_firehose_delivery_stream.go b/aws/resource_aws_kinesis_firehose_delivery_stream.go index d570bb62b60..2e09eafb476 100644 --- a/aws/resource_aws_kinesis_firehose_delivery_stream.go +++ b/aws/resource_aws_kinesis_firehose_delivery_stream.go @@ -1754,7 +1754,7 @@ func extractPrefixConfiguration(s3 map[string]interface{}) *string { func createRedshiftConfig(d *schema.ResourceData, s3Config *firehose.S3DestinationConfiguration) (*firehose.RedshiftDestinationConfiguration, error) { redshiftRaw, ok := d.GetOk("redshift_configuration") if !ok { - return nil, fmt.Errorf("[ERR] Error loading Redshift Configuration for Kinesis Firehose: redshift_configuration not found") + return nil, fmt.Errorf("Error loading Redshift Configuration for Kinesis Firehose: redshift_configuration not found") } rl := redshiftRaw.([]interface{}) @@ -1787,7 +1787,7 @@ func createRedshiftConfig(d *schema.ResourceData, s3Config *firehose.S3Destinati func updateRedshiftConfig(d *schema.ResourceData, s3Update *firehose.S3DestinationUpdate) (*firehose.RedshiftDestinationUpdate, error) { redshiftRaw, ok := d.GetOk("redshift_configuration") if !ok { - return nil, fmt.Errorf("[ERR] Error loading Redshift Configuration for Kinesis Firehose: redshift_configuration not found") + return nil, fmt.Errorf("Error loading Redshift Configuration for Kinesis Firehose: redshift_configuration not found") } rl := redshiftRaw.([]interface{}) @@ -1820,7 +1820,7 @@ func updateRedshiftConfig(d *schema.ResourceData, s3Update *firehose.S3Destinati func createElasticsearchConfig(d *schema.ResourceData, s3Config *firehose.S3DestinationConfiguration) (*firehose.ElasticsearchDestinationConfiguration, error) { esConfig, ok := d.GetOk("elasticsearch_configuration") if !ok { - return nil, fmt.Errorf("[ERR] Error loading Elasticsearch Configuration for Kinesis Firehose: elasticsearch_configuration not found") + return nil, fmt.Errorf("Error loading Elasticsearch Configuration for Kinesis Firehose: elasticsearch_configuration not found") } esList := esConfig.([]interface{}) @@ -1857,7 +1857,7 @@ func createElasticsearchConfig(d *schema.ResourceData, s3Config *firehose.S3Dest func updateElasticsearchConfig(d *schema.ResourceData, s3Update *firehose.S3DestinationUpdate) (*firehose.ElasticsearchDestinationUpdate, error) { esConfig, ok := d.GetOk("elasticsearch_configuration") if !ok { - return nil, fmt.Errorf("[ERR] Error loading Elasticsearch Configuration for Kinesis Firehose: elasticsearch_configuration not found") + return nil, fmt.Errorf("Error loading Elasticsearch Configuration for Kinesis Firehose: elasticsearch_configuration not found") } esList := esConfig.([]interface{}) @@ -1891,7 +1891,7 @@ func updateElasticsearchConfig(d *schema.ResourceData, s3Update *firehose.S3Dest func createSplunkConfig(d *schema.ResourceData, s3Config *firehose.S3DestinationConfiguration) (*firehose.SplunkDestinationConfiguration, error) { splunkRaw, ok := d.GetOk("splunk_configuration") if !ok { - return nil, fmt.Errorf("[ERR] Error loading Splunk Configuration for Kinesis Firehose: splunk_configuration not found") + return nil, fmt.Errorf("Error loading Splunk Configuration for Kinesis Firehose: splunk_configuration not found") } sl := splunkRaw.([]interface{}) @@ -1923,7 +1923,7 @@ func createSplunkConfig(d *schema.ResourceData, s3Config *firehose.S3Destination func updateSplunkConfig(d *schema.ResourceData, s3Update *firehose.S3DestinationUpdate) (*firehose.SplunkDestinationUpdate, error) { splunkRaw, ok := d.GetOk("splunk_configuration") if !ok { - return nil, fmt.Errorf("[ERR] Error loading Splunk Configuration for Kinesis Firehose: splunk_configuration not found") + return nil, fmt.Errorf("Error loading Splunk Configuration for Kinesis Firehose: splunk_configuration not found") } sl := splunkRaw.([]interface{}) diff --git a/aws/resource_aws_kinesis_stream.go b/aws/resource_aws_kinesis_stream.go index dede2bd9e62..0294dbfe58c 100644 --- a/aws/resource_aws_kinesis_stream.go +++ b/aws/resource_aws_kinesis_stream.go @@ -171,7 +171,7 @@ func resourceAwsKinesisStreamRead(d *schema.ResourceData, meta interface{}) erro d.SetId("") return nil } - return fmt.Errorf("[WARN] Error reading Kinesis Stream: \"%s\", code: \"%s\"", awsErr.Message(), awsErr.Code()) + return fmt.Errorf("Error reading Kinesis Stream: \"%s\", code: \"%s\"", awsErr.Message(), awsErr.Code()) } return err diff --git a/aws/resource_aws_kms_grant.go b/aws/resource_aws_kms_grant.go index 29041f23e12..fe434f43d72 100644 --- a/aws/resource_aws_kms_grant.go +++ b/aws/resource_aws_kms_grant.go @@ -132,7 +132,7 @@ func resourceAwsKmsGrantCreate(d *schema.ResourceData, meta interface{}) error { } if v, ok := d.GetOk("constraints"); ok { if !kmsGrantConstraintsIsValid(v.(*schema.Set)) { - return fmt.Errorf("[ERROR] A grant constraint can't have both encryption_context_equals and encryption_context_subset set") + return fmt.Errorf("A grant constraint can't have both encryption_context_equals and encryption_context_subset set") } input.Constraints = expandKmsGrantConstraints(v.(*schema.Set)) } @@ -160,7 +160,7 @@ func resourceAwsKmsGrantCreate(d *schema.ResourceData, meta interface{}) error { isAWSErr(err, kms.ErrCodeInternalException, "") || isAWSErr(err, kms.ErrCodeInvalidArnException, "") { return resource.RetryableError( - fmt.Errorf("[WARN] Error adding new KMS Grant for key: %s, retrying %s", + fmt.Errorf("Error adding new KMS Grant for key: %s, retrying %s", *input.KeyId, err)) } log.Printf("[ERROR] An error occurred creating new AWS KMS Grant: %s", err) @@ -355,7 +355,7 @@ func waitForKmsGrantToBeRevoked(conn *kms.KMS, keyId string, grantId string) err if grant != nil { // Force a retry if the grant still exists return resource.RetryableError( - fmt.Errorf("[DEBUG] Grant still exists while expected to be revoked, retyring revocation check: %s", *grant.GrantId)) + fmt.Errorf("Grant still exists while expected to be revoked, retyring revocation check: %s", *grant.GrantId)) } return resource.NonRetryableError(err) diff --git a/aws/resource_aws_kms_key.go b/aws/resource_aws_kms_key.go index 893eeb3d895..e27ea971b77 100644 --- a/aws/resource_aws_kms_key.go +++ b/aws/resource_aws_kms_key.go @@ -8,7 +8,6 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/service/kms" - "github.com/hashicorp/errwrap" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/structure" @@ -169,7 +168,7 @@ func resourceAwsKmsKeyRead(d *schema.ResourceData, meta interface{}) error { p := pOut.(*kms.GetKeyPolicyOutput) policy, err := structure.NormalizeJsonString(*p.Policy) if err != nil { - return errwrap.Wrapf("policy contains an invalid JSON: {{err}}", err) + return fmt.Errorf("policy contains an invalid JSON: %s", err) } d.Set("policy", policy) @@ -260,7 +259,7 @@ func resourceAwsKmsKeyDescriptionUpdate(conn *kms.KMS, d *schema.ResourceData) e func resourceAwsKmsKeyPolicyUpdate(conn *kms.KMS, d *schema.ResourceData) error { policy, err := structure.NormalizeJsonString(d.Get("policy").(string)) if err != nil { - return errwrap.Wrapf("policy contains an invalid JSON: {{err}}", err) + return fmt.Errorf("policy contains an invalid JSON: %s", err) } keyId := d.Get("key_id").(string) diff --git a/aws/resource_aws_lambda_function.go b/aws/resource_aws_lambda_function.go index fb4706374cd..f98de7260ae 100644 --- a/aws/resource_aws_lambda_function.go +++ b/aws/resource_aws_lambda_function.go @@ -505,7 +505,7 @@ func resourceAwsLambdaFunctionRead(d *schema.ResourceData, meta interface{}) err config := flattenLambdaVpcConfigResponse(function.VpcConfig) log.Printf("[INFO] Setting Lambda %s VPC config %#v from API", d.Id(), config) if err := d.Set("vpc_config", config); err != nil { - return fmt.Errorf("[ERR] Error setting vpc_config for Lambda Function (%s): %s", d.Id(), err) + return fmt.Errorf("Error setting vpc_config for Lambda Function (%s): %s", d.Id(), err) } environment := flattenLambdaEnvironment(function.Environment) diff --git a/aws/resource_aws_lambda_permission.go b/aws/resource_aws_lambda_permission.go index 263c5959481..11308e53be7 100644 --- a/aws/resource_aws_lambda_permission.go +++ b/aws/resource_aws_lambda_permission.go @@ -135,7 +135,7 @@ func resourceAwsLambdaPermissionCreate(d *schema.ResourceData, meta interface{}) // IAM is eventually consistent :/ if awsErr.Code() == "ResourceConflictException" { return resource.RetryableError( - fmt.Errorf("[WARN] Error adding new Lambda Permission for %s, retrying: %s", + fmt.Errorf("Error adding new Lambda Permission for %s, retrying: %s", *input.FunctionName, err)) } } @@ -162,12 +162,12 @@ func resourceAwsLambdaPermissionCreate(d *schema.ResourceData, meta interface{}) if err != nil { if strings.HasPrefix(err.Error(), "Error reading Lambda policy: ResourceNotFoundException") { return resource.RetryableError( - fmt.Errorf("[WARN] Error reading newly created Lambda Permission for %s, retrying: %s", + fmt.Errorf("Error reading newly created Lambda Permission for %s, retrying: %s", *input.FunctionName, err)) } if strings.HasPrefix(err.Error(), "Failed to find statement \""+d.Id()) { return resource.RetryableError( - fmt.Errorf("[WARN] Error reading newly created Lambda Permission statement for %s, retrying: %s", + fmt.Errorf("Error reading newly created Lambda Permission statement for %s, retrying: %s", *input.FunctionName, err)) } diff --git a/aws/resource_aws_lightsail_instance.go b/aws/resource_aws_lightsail_instance.go index 117223a9db9..17fdf90e603 100644 --- a/aws/resource_aws_lightsail_instance.go +++ b/aws/resource_aws_lightsail_instance.go @@ -132,7 +132,7 @@ func resourceAwsLightsailInstanceCreate(d *schema.ResourceData, meta interface{} } if len(resp.Operations) == 0 { - return fmt.Errorf("[ERR] No operations found for CreateInstance request") + return fmt.Errorf("No operations found for CreateInstance request") } op := resp.Operations[0] @@ -254,7 +254,7 @@ func resourceAwsLightsailOperationRefreshFunc( } if o.Operation == nil { - return nil, "Failed", fmt.Errorf("[ERR] Error retrieving Operation info for operation (%s)", *oid) + return nil, "Failed", fmt.Errorf("Error retrieving Operation info for operation (%s)", *oid) } log.Printf("[DEBUG] Lightsail Operation (%s) is currently %q", *oid, *o.Operation.Status) diff --git a/aws/resource_aws_lightsail_key_pair.go b/aws/resource_aws_lightsail_key_pair.go index af33dab7cb7..892ed298f32 100644 --- a/aws/resource_aws_lightsail_key_pair.go +++ b/aws/resource_aws_lightsail_key_pair.go @@ -103,10 +103,10 @@ func resourceAwsLightsailKeyPairCreate(d *schema.ResourceData, meta interface{}) return err } if resp.Operation == nil { - return fmt.Errorf("[ERR] No operation found for CreateKeyPair response") + return fmt.Errorf("No operation found for CreateKeyPair response") } if resp.KeyPair == nil { - return fmt.Errorf("[ERR] No KeyPair information found for CreateKeyPair response") + return fmt.Errorf("No KeyPair information found for CreateKeyPair response") } d.SetId(kName) diff --git a/aws/resource_aws_neptune_cluster.go b/aws/resource_aws_neptune_cluster.go index 94d4a77c6bc..3ced18b515c 100644 --- a/aws/resource_aws_neptune_cluster.go +++ b/aws/resource_aws_neptune_cluster.go @@ -652,7 +652,7 @@ func resourceAwsNeptuneClusterDelete(d *schema.ResourceData, meta interface{}) e // Wait, catching any errors _, err = stateConf.WaitForState() if err != nil { - return fmt.Errorf("[WARN] Error deleting Neptune Cluster (%s): %s", d.Id(), err) + return fmt.Errorf("Error deleting Neptune Cluster (%s): %s", d.Id(), err) } return nil diff --git a/aws/resource_aws_network_acl.go b/aws/resource_aws_network_acl.go index 2e1ce235e5e..3776cc2c0dd 100644 --- a/aws/resource_aws_network_acl.go +++ b/aws/resource_aws_network_acl.go @@ -538,7 +538,7 @@ func resourceAwsNetworkAclDelete(d *schema.ResourceData, meta interface{}) error }) if retryErr != nil { - return fmt.Errorf("[ERR] Error destroying Network ACL (%s): %s", d.Id(), retryErr) + return fmt.Errorf("Error destroying Network ACL (%s): %s", d.Id(), retryErr) } return nil } diff --git a/aws/resource_aws_opsworks_instance.go b/aws/resource_aws_opsworks_instance.go index e876b834f0a..16241ad3470 100644 --- a/aws/resource_aws_opsworks_instance.go +++ b/aws/resource_aws_opsworks_instance.go @@ -533,10 +533,10 @@ func resourceAwsOpsworksInstanceRead(d *schema.ResourceData, meta interface{}) e } layerIds, err = sortListBasedonTFFile(layerIds, d, "layer_ids") if err != nil { - return fmt.Errorf("[DEBUG] Error sorting layer_ids attribute: %#v", err) + return fmt.Errorf("Error sorting layer_ids attribute: %#v", err) } if err := d.Set("layer_ids", layerIds); err != nil { - return fmt.Errorf("[DEBUG] Error setting layer_ids attribute: %#v, error: %#v", layerIds, err) + return fmt.Errorf("Error setting layer_ids attribute: %#v, error: %#v", layerIds, err) } d.Set("os", instance.Os) d.Set("platform", instance.Platform) diff --git a/aws/resource_aws_opsworks_stack.go b/aws/resource_aws_opsworks_stack.go index a173da10a79..dbb0887be91 100644 --- a/aws/resource_aws_opsworks_stack.go +++ b/aws/resource_aws_opsworks_stack.go @@ -7,7 +7,6 @@ import ( "strings" "time" - "github.com/hashicorp/errwrap" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" @@ -385,7 +384,7 @@ func opsworksConnForRegion(region string, meta interface{}) (*opsworks.OpsWorks, // Set up base session sess, err := session.NewSession(&originalConn.Config) if err != nil { - return nil, errwrap.Wrapf("Error creating AWS session: {{err}}", err) + return nil, fmt.Errorf("Error creating AWS session: %s", err) } sess.Handlers.Build.PushBackNamed(addTerraformVersionToUserAgent) diff --git a/aws/resource_aws_rds_cluster.go b/aws/resource_aws_rds_cluster.go index 74288c62d4c..2f1c0e7e41e 100644 --- a/aws/resource_aws_rds_cluster.go +++ b/aws/resource_aws_rds_cluster.go @@ -830,7 +830,7 @@ func resourceAwsRDSClusterCreate(d *schema.ResourceData, meta interface{}) error // Wait, catching any errors _, err := stateConf.WaitForState() if err != nil { - return fmt.Errorf("[WARN] Error waiting for RDS Cluster state to be \"available\": %s", err) + return fmt.Errorf("Error waiting for RDS Cluster state to be \"available\": %s", err) } if v, ok := d.GetOk("iam_roles"); ok { @@ -1153,7 +1153,7 @@ func resourceAwsRDSClusterDelete(d *schema.ResourceData, meta interface{}) error // Wait, catching any errors _, err = stateConf.WaitForState() if err != nil { - return fmt.Errorf("[WARN] Error deleting RDS Cluster (%s): %s", d.Id(), err) + return fmt.Errorf("Error deleting RDS Cluster (%s): %s", d.Id(), err) } return nil diff --git a/aws/resource_aws_rds_cluster_instance.go b/aws/resource_aws_rds_cluster_instance.go index 70ad3d3dafe..07a05e9b6ee 100644 --- a/aws/resource_aws_rds_cluster_instance.go +++ b/aws/resource_aws_rds_cluster_instance.go @@ -313,7 +313,7 @@ func resourceAwsRDSClusterInstanceRead(d *schema.ResourceData, meta interface{}) db, err := resourceAwsDbInstanceRetrieve(d.Id(), meta.(*AWSClient).rdsconn) // Errors from this helper are always reportable if err != nil { - return fmt.Errorf("[WARN] Error on retrieving RDS Cluster Instance (%s): %s", d.Id(), err) + return fmt.Errorf("Error on retrieving RDS Cluster Instance (%s): %s", d.Id(), err) } // A nil response means "not found" if db == nil { @@ -340,7 +340,7 @@ func resourceAwsRDSClusterInstanceRead(d *schema.ResourceData, meta interface{}) } if dbc == nil { - return fmt.Errorf("[WARN] Error finding RDS Cluster (%s) for Cluster Instance (%s): %s", + return fmt.Errorf("Error finding RDS Cluster (%s) for Cluster Instance (%s): %s", *db.DBClusterIdentifier, *db.DBInstanceIdentifier, err) } diff --git a/aws/resource_aws_redshift_cluster.go b/aws/resource_aws_redshift_cluster.go index 54123514d8b..4fe7d0592f4 100644 --- a/aws/resource_aws_redshift_cluster.go +++ b/aws/resource_aws_redshift_cluster.go @@ -491,7 +491,7 @@ func resourceAwsRedshiftClusterCreate(d *schema.ResourceData, meta interface{}) _, err := stateConf.WaitForState() if err != nil { - return fmt.Errorf("[WARN] Error waiting for Redshift Cluster state to be \"available\": %s", err) + return fmt.Errorf("Error waiting for Redshift Cluster state to be \"available\": %s", err) } if v, ok := d.GetOk("snapshot_copy"); ok { @@ -591,7 +591,7 @@ func resourceAwsRedshiftClusterRead(d *schema.ResourceData, meta interface{}) er vpcg = append(vpcg, *g.VpcSecurityGroupId) } if err := d.Set("vpc_security_group_ids", vpcg); err != nil { - return fmt.Errorf("[DEBUG] Error saving VPC Security Group IDs to state for Redshift Cluster (%s): %s", d.Id(), err) + return fmt.Errorf("Error saving VPC Security Group IDs to state for Redshift Cluster (%s): %s", d.Id(), err) } var csg []string @@ -599,7 +599,7 @@ func resourceAwsRedshiftClusterRead(d *schema.ResourceData, meta interface{}) er csg = append(csg, *g.ClusterSecurityGroupName) } if err := d.Set("cluster_security_groups", csg); err != nil { - return fmt.Errorf("[DEBUG] Error saving Cluster Security Group Names to state for Redshift Cluster (%s): %s", d.Id(), err) + return fmt.Errorf("Error saving Cluster Security Group Names to state for Redshift Cluster (%s): %s", d.Id(), err) } var iamRoles []string @@ -607,7 +607,7 @@ func resourceAwsRedshiftClusterRead(d *schema.ResourceData, meta interface{}) er iamRoles = append(iamRoles, *i.IamRoleArn) } if err := d.Set("iam_roles", iamRoles); err != nil { - return fmt.Errorf("[DEBUG] Error saving IAM Roles to state for Redshift Cluster (%s): %s", d.Id(), err) + return fmt.Errorf("Error saving IAM Roles to state for Redshift Cluster (%s): %s", d.Id(), err) } d.Set("cluster_public_key", rsc.ClusterPublicKey) @@ -718,7 +718,7 @@ func resourceAwsRedshiftClusterUpdate(d *schema.ResourceData, meta interface{}) log.Printf("[DEBUG] Redshift Cluster Modify options: %s", req) _, err := conn.ModifyCluster(req) if err != nil { - return fmt.Errorf("[WARN] Error modifying Redshift Cluster (%s): %s", d.Id(), err) + return fmt.Errorf("Error modifying Redshift Cluster (%s): %s", d.Id(), err) } } @@ -748,7 +748,7 @@ func resourceAwsRedshiftClusterUpdate(d *schema.ResourceData, meta interface{}) log.Printf("[DEBUG] Redshift Cluster Modify IAM Role options: %s", req) _, err := conn.ModifyClusterIamRoles(req) if err != nil { - return fmt.Errorf("[WARN] Error modifying Redshift Cluster IAM Roles (%s): %s", d.Id(), err) + return fmt.Errorf("Error modifying Redshift Cluster IAM Roles (%s): %s", d.Id(), err) } d.SetPartial("iam_roles") @@ -767,7 +767,7 @@ func resourceAwsRedshiftClusterUpdate(d *schema.ResourceData, meta interface{}) // Wait, catching any errors _, err := stateConf.WaitForState() if err != nil { - return fmt.Errorf("[WARN] Error Modifying Redshift Cluster (%s): %s", d.Id(), err) + return fmt.Errorf("Error Modifying Redshift Cluster (%s): %s", d.Id(), err) } } @@ -917,7 +917,7 @@ func deleteAwsRedshiftCluster(opts *redshift.DeleteClusterInput, conn *redshift. return resource.NonRetryableError(err) }) if err != nil { - return nil, fmt.Errorf("[ERROR] Error deleting Redshift Cluster (%s): %s", + return nil, fmt.Errorf("Error deleting Redshift Cluster (%s): %s", id, err) } diff --git a/aws/resource_aws_redshift_subnet_group.go b/aws/resource_aws_redshift_subnet_group.go index d0c6265e894..e503108ece7 100644 --- a/aws/resource_aws_redshift_subnet_group.go +++ b/aws/resource_aws_redshift_subnet_group.go @@ -100,7 +100,7 @@ func resourceAwsRedshiftSubnetGroupRead(d *schema.ResourceData, meta interface{} d.Set("description", describeResp.ClusterSubnetGroups[0].Description) d.Set("subnet_ids", subnetIdsToSlice(describeResp.ClusterSubnetGroups[0].Subnets)) if err := d.Set("tags", tagsToMapRedshift(describeResp.ClusterSubnetGroups[0].Tags)); err != nil { - return fmt.Errorf("[DEBUG] Error setting Redshift Subnet Group Tags: %#v", err) + return fmt.Errorf("Error setting Redshift Subnet Group Tags: %#v", err) } return nil diff --git a/aws/resource_aws_route53_record.go b/aws/resource_aws_route53_record.go index 92c10adb301..3a47ec9cdb0 100644 --- a/aws/resource_aws_route53_record.go +++ b/aws/resource_aws_route53_record.go @@ -10,7 +10,6 @@ import ( "strings" "time" - "github.com/hashicorp/errwrap" "github.com/hashicorp/terraform/helper/hashcode" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" @@ -279,7 +278,7 @@ func resourceAwsRoute53RecordUpdate(d *schema.ResourceData, meta interface{}) er return err } if zoneRecord.HostedZone == nil { - return fmt.Errorf("[WARN] No Route53 Zone found for id (%s)", zone) + return fmt.Errorf("No Route53 Zone found for id (%s)", zone) } // Build the to be deleted record @@ -353,7 +352,7 @@ func resourceAwsRoute53RecordUpdate(d *schema.ResourceData, meta interface{}) er respRaw, err := changeRoute53RecordSet(conn, req) if err != nil { - return errwrap.Wrapf("[ERR]: Error building changeset: {{err}}", err) + return fmt.Errorf("[ERR]: Error building changeset: %s", err) } changeInfo := respRaw.(*route53.ChangeResourceRecordSetsOutput).ChangeInfo @@ -389,7 +388,7 @@ func resourceAwsRoute53RecordCreate(d *schema.ResourceData, meta interface{}) er return err } if zoneRecord.HostedZone == nil { - return fmt.Errorf("[WARN] No Route53 Zone found for id (%s)", zone) + return fmt.Errorf("No Route53 Zone found for id (%s)", zone) } // Build the record @@ -431,7 +430,7 @@ func resourceAwsRoute53RecordCreate(d *schema.ResourceData, meta interface{}) er respRaw, err := changeRoute53RecordSet(conn, req) if err != nil { - return errwrap.Wrapf("[ERR]: Error building changeset: {{err}}", err) + return fmt.Errorf("[ERR]: Error building changeset: %s", err) } changeInfo := respRaw.(*route53.ChangeResourceRecordSetsOutput).ChangeInfo @@ -534,7 +533,7 @@ func resourceAwsRoute53RecordRead(d *schema.ResourceData, meta interface{}) erro err = d.Set("records", flattenResourceRecords(record.ResourceRecords, *record.Type)) if err != nil { - return fmt.Errorf("[DEBUG] Error setting records for: %s, error: %#v", d.Id(), err) + return fmt.Errorf("Error setting records for: %s, error: %#v", d.Id(), err) } if alias := record.AliasTarget; alias != nil { @@ -555,7 +554,7 @@ func resourceAwsRoute53RecordRead(d *schema.ResourceData, meta interface{}) erro "type": aws.StringValue(record.Failover), }} if err := d.Set("failover_routing_policy", v); err != nil { - return fmt.Errorf("[DEBUG] Error setting failover records for: %s, error: %#v", d.Id(), err) + return fmt.Errorf("Error setting failover records for: %s, error: %#v", d.Id(), err) } } @@ -566,7 +565,7 @@ func resourceAwsRoute53RecordRead(d *schema.ResourceData, meta interface{}) erro "subdivision": aws.StringValue(record.GeoLocation.SubdivisionCode), }} if err := d.Set("geolocation_routing_policy", v); err != nil { - return fmt.Errorf("[DEBUG] Error setting gelocation records for: %s, error: %#v", d.Id(), err) + return fmt.Errorf("Error setting gelocation records for: %s, error: %#v", d.Id(), err) } } @@ -575,7 +574,7 @@ func resourceAwsRoute53RecordRead(d *schema.ResourceData, meta interface{}) erro "region": aws.StringValue(record.Region), }} if err := d.Set("latency_routing_policy", v); err != nil { - return fmt.Errorf("[DEBUG] Error setting latency records for: %s, error: %#v", d.Id(), err) + return fmt.Errorf("Error setting latency records for: %s, error: %#v", d.Id(), err) } } @@ -584,13 +583,13 @@ func resourceAwsRoute53RecordRead(d *schema.ResourceData, meta interface{}) erro "weight": aws.Int64Value((record.Weight)), }} if err := d.Set("weighted_routing_policy", v); err != nil { - return fmt.Errorf("[DEBUG] Error setting weighted records for: %s, error: %#v", d.Id(), err) + return fmt.Errorf("Error setting weighted records for: %s, error: %#v", d.Id(), err) } } if record.MultiValueAnswer != nil { if err := d.Set("multivalue_answer_routing_policy", *record.MultiValueAnswer); err != nil { - return fmt.Errorf("[DEBUG] Error setting multivalue answer records for: %s, error: %#v", d.Id(), err) + return fmt.Errorf("Error setting multivalue answer records for: %s, error: %#v", d.Id(), err) } } @@ -727,7 +726,7 @@ func resourceAwsRoute53RecordDelete(d *schema.ResourceData, meta interface{}) er respRaw, err := deleteRoute53RecordSet(conn, req) if err != nil { - return errwrap.Wrapf("[ERR]: Error building changeset: {{err}}", err) + return fmt.Errorf("[ERR]: Error building changeset: %s", err) } changeInfo := respRaw.(*route53.ChangeResourceRecordSetsOutput).ChangeInfo diff --git a/aws/resource_aws_route53_zone.go b/aws/resource_aws_route53_zone.go index f24743f5434..b8df2d202e0 100644 --- a/aws/resource_aws_route53_zone.go +++ b/aws/resource_aws_route53_zone.go @@ -7,7 +7,6 @@ import ( "strings" "time" - "github.com/hashicorp/errwrap" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" @@ -166,7 +165,7 @@ func resourceAwsRoute53ZoneRead(d *schema.ResourceData, meta interface{}) error } sort.Strings(ns) if err := d.Set("name_servers", ns); err != nil { - return fmt.Errorf("[DEBUG] Error setting name servers for: %s, error: %#v", d.Id(), err) + return fmt.Errorf("Error setting name servers for: %s, error: %#v", d.Id(), err) } } else { ns, err := getNameServers(d.Id(), d.Get("name").(string), r53) @@ -174,7 +173,7 @@ func resourceAwsRoute53ZoneRead(d *schema.ResourceData, meta interface{}) error return err } if err := d.Set("name_servers", ns); err != nil { - return fmt.Errorf("[DEBUG] Error setting name servers for: %s, error: %#v", d.Id(), err) + return fmt.Errorf("Error setting name servers for: %s, error: %#v", d.Id(), err) } // In the import case we just associate it with the first VPC @@ -198,7 +197,7 @@ func resourceAwsRoute53ZoneRead(d *schema.ResourceData, meta interface{}) error } } if associatedVPC == nil { - return fmt.Errorf("[DEBUG] VPC: %v is not associated with Zone: %v", d.Get("vpc_id"), d.Id()) + return fmt.Errorf("VPC: %v is not associated with Zone: %v", d.Get("vpc_id"), d.Id()) } } @@ -268,7 +267,7 @@ func resourceAwsRoute53ZoneDelete(d *schema.ResourceData, meta interface{}) erro if d.Get("force_destroy").(bool) { if err := deleteAllRecordsInHostedZoneId(d.Id(), d.Get("name").(string), r53); err != nil { - return errwrap.Wrapf("{{err}}", err) + return fmt.Errorf("%s", err) } } diff --git a/aws/resource_aws_s3_bucket.go b/aws/resource_aws_s3_bucket.go index abd5951242b..1830c8c2748 100644 --- a/aws/resource_aws_s3_bucket.go +++ b/aws/resource_aws_s3_bucket.go @@ -15,7 +15,6 @@ import ( "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/aws/endpoints" "github.com/aws/aws-sdk-go/service/s3" - "github.com/hashicorp/errwrap" "github.com/hashicorp/terraform/helper/hashcode" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" @@ -540,7 +539,7 @@ func resourceAwsS3BucketCreate(d *schema.ResourceData, meta interface{}) error { if awsErr.Code() == "OperationAborted" { log.Printf("[WARN] Got an error while trying to create S3 bucket %s: %s", bucket, err) return resource.RetryableError( - fmt.Errorf("[WARN] Error creating S3 bucket %s, retrying: %s", + fmt.Errorf("Error creating S3 bucket %s, retrying: %s", bucket, err)) } } @@ -681,7 +680,7 @@ func resourceAwsS3BucketRead(d *schema.ResourceData, meta interface{}) error { } else { policy, err := structure.NormalizeJsonString(*v) if err != nil { - return errwrap.Wrapf("policy contains an invalid JSON: {{err}}", err) + return fmt.Errorf("policy contains an invalid JSON: %s", err) } d.Set("policy", policy) } diff --git a/aws/resource_aws_security_group_rule.go b/aws/resource_aws_security_group_rule.go index d711d31ae39..b7de49b8016 100644 --- a/aws/resource_aws_security_group_rule.go +++ b/aws/resource_aws_security_group_rule.go @@ -11,7 +11,6 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/hashicorp/errwrap" "github.com/hashicorp/terraform/helper/hashcode" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" @@ -283,7 +282,7 @@ func resourceAwsSecurityGroupRuleRead(d *schema.ResourceData, meta interface{}) d.Set("type", ruleType) if err := setFromIPPerm(d, sg, p); err != nil { - return errwrap.Wrapf("Error setting IP Permission for Security Group Rule: {{err}}", err) + return fmt.Errorf("Error setting IP Permission for Security Group Rule: %s", err) } d.Set("description", descriptionFromIPPerm(d, rule)) diff --git a/aws/resource_aws_security_group_rule_migrate.go b/aws/resource_aws_security_group_rule_migrate.go index 5caadfa8a35..1b2cb21f8d6 100644 --- a/aws/resource_aws_security_group_rule_migrate.go +++ b/aws/resource_aws_security_group_rule_migrate.go @@ -37,7 +37,7 @@ func migrateSGRuleStateV0toV1(is *terraform.InstanceState) (*terraform.InstanceS perm, err := migrateExpandIPPerm(is.Attributes) if err != nil { - return nil, fmt.Errorf("[WARN] Error making new IP Permission in Security Group migration") + return nil, fmt.Errorf("Error making new IP Permission in Security Group migration") } log.Printf("[DEBUG] Attributes before migration: %#v", is.Attributes) diff --git a/aws/resource_aws_sfn_activity_test.go b/aws/resource_aws_sfn_activity_test.go index 47a005717ae..8cece7d3e95 100644 --- a/aws/resource_aws_sfn_activity_test.go +++ b/aws/resource_aws_sfn_activity_test.go @@ -3,6 +3,7 @@ package aws import ( "fmt" "testing" + "time" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/awserr" @@ -10,7 +11,6 @@ import ( "github.com/hashicorp/terraform/helper/acctest" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" - "time" ) func TestAccAWSSfnActivity_basic(t *testing.T) { diff --git a/aws/resource_aws_sfn_state_machine.go b/aws/resource_aws_sfn_state_machine.go index 4668ff01aab..388cfa56292 100644 --- a/aws/resource_aws_sfn_state_machine.go +++ b/aws/resource_aws_sfn_state_machine.go @@ -8,7 +8,6 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/service/sfn" - "github.com/hashicorp/errwrap" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/validation" @@ -88,7 +87,7 @@ func resourceAwsSfnStateMachineCreate(d *schema.ResourceData, meta interface{}) }) if err != nil { - return errwrap.Wrapf("Error creating Step Function State Machine: {{err}}", err) + return fmt.Errorf("Error creating Step Function State Machine: %s", err) } d.SetId(*activity.StateMachineArn) diff --git a/aws/resource_aws_spot_datafeed_subscription.go b/aws/resource_aws_spot_datafeed_subscription.go index 25e9f51eca8..5051e17603d 100644 --- a/aws/resource_aws_spot_datafeed_subscription.go +++ b/aws/resource_aws_spot_datafeed_subscription.go @@ -1,12 +1,12 @@ package aws import ( + "fmt" "log" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/hashicorp/errwrap" "github.com/hashicorp/terraform/helper/schema" ) @@ -48,7 +48,7 @@ func resourceAwsSpotDataFeedSubscriptionCreate(d *schema.ResourceData, meta inte log.Printf("[INFO] Creating Spot Datafeed Subscription") _, err := conn.CreateSpotDatafeedSubscription(params) if err != nil { - return errwrap.Wrapf("Error Creating Spot Datafeed Subscription: {{err}}", err) + return fmt.Errorf("Error Creating Spot Datafeed Subscription: %s", err) } d.SetId("spot-datafeed-subscription") @@ -66,7 +66,7 @@ func resourceAwsSpotDataFeedSubscriptionRead(d *schema.ResourceData, meta interf d.SetId("") return nil } - return errwrap.Wrapf("Error Describing Spot Datafeed Subscription: {{err}}", err) + return fmt.Errorf("Error Describing Spot Datafeed Subscription: %s", err) } if resp == nil { @@ -87,7 +87,7 @@ func resourceAwsSpotDataFeedSubscriptionDelete(d *schema.ResourceData, meta inte log.Printf("[INFO] Deleting Spot Datafeed Subscription") _, err := conn.DeleteSpotDatafeedSubscription(&ec2.DeleteSpotDatafeedSubscriptionInput{}) if err != nil { - return errwrap.Wrapf("Error deleting Spot Datafeed Subscription: {{err}}", err) + return fmt.Errorf("Error deleting Spot Datafeed Subscription: %s", err) } return nil } diff --git a/aws/resource_aws_spot_fleet_request.go b/aws/resource_aws_spot_fleet_request.go index 15fcb4c01ed..f69e3f45444 100644 --- a/aws/resource_aws_spot_fleet_request.go +++ b/aws/resource_aws_spot_fleet_request.go @@ -696,7 +696,7 @@ func resourceAwsSpotFleetRequestCreate(d *schema.ResourceData, meta interface{}) // IAM is eventually consistent :/ if awsErr.Code() == "InvalidSpotFleetRequestConfig" { return resource.RetryableError( - fmt.Errorf("[WARN] Error creating Spot fleet request, retrying: %s", err)) + fmt.Errorf("Error creating Spot fleet request, retrying: %s", err)) } } return resource.NonRetryableError(err) diff --git a/aws/resource_aws_spot_instance_request.go b/aws/resource_aws_spot_instance_request.go index ed9601dd208..d336db6c101 100644 --- a/aws/resource_aws_spot_instance_request.go +++ b/aws/resource_aws_spot_instance_request.go @@ -267,7 +267,7 @@ func resourceAwsSpotInstanceRequestRead(d *schema.ResourceData, meta interface{} d.Set("spot_instance_id", *request.InstanceId) // Read the instance data, setting up connection information if err := readInstance(d, meta); err != nil { - return fmt.Errorf("[ERR] Error reading Spot Instance Data: %s", err) + return fmt.Errorf("Error reading Spot Instance Data: %s", err) } } diff --git a/aws/resource_aws_sqs_queue.go b/aws/resource_aws_sqs_queue.go index 69bb12d1c62..1c55109d4be 100644 --- a/aws/resource_aws_sqs_queue.go +++ b/aws/resource_aws_sqs_queue.go @@ -250,7 +250,7 @@ func resourceAwsSqsQueueUpdate(d *schema.ResourceData, meta interface{}) error { Attributes: attributes, } if _, err := sqsconn.SetQueueAttributes(req); err != nil { - return fmt.Errorf("[ERR] Error updating SQS attributes: %s", err) + return fmt.Errorf("Error updating SQS attributes: %s", err) } } diff --git a/aws/resource_aws_ssm_activation.go b/aws/resource_aws_ssm_activation.go index 8fb58671d0b..fa3cc6181f3 100644 --- a/aws/resource_aws_ssm_activation.go +++ b/aws/resource_aws_ssm_activation.go @@ -7,7 +7,6 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ssm" - "github.com/hashicorp/errwrap" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" ) @@ -106,11 +105,11 @@ func resourceAwsSsmActivationCreate(d *schema.ResourceData, meta interface{}) er }) if err != nil { - return errwrap.Wrapf("[ERROR] Error creating SSM activation: {{err}}", err) + return fmt.Errorf("Error creating SSM activation: %s", err) } if resp.ActivationId == nil { - return fmt.Errorf("[ERROR] ActivationId was nil") + return fmt.Errorf("ActivationId was nil") } d.SetId(*resp.ActivationId) d.Set("activation_code", resp.ActivationCode) @@ -138,10 +137,10 @@ func resourceAwsSsmActivationRead(d *schema.ResourceData, meta interface{}) erro resp, err := ssmconn.DescribeActivations(params) if err != nil { - return errwrap.Wrapf("[ERROR] Error reading SSM activation: {{err}}", err) + return fmt.Errorf("Error reading SSM activation: %s", err) } if resp.ActivationList == nil || len(resp.ActivationList) == 0 { - return fmt.Errorf("[ERROR] ActivationList was nil or empty") + return fmt.Errorf("ActivationList was nil or empty") } activation := resp.ActivationList[0] // Only 1 result as MaxResults is 1 above @@ -168,7 +167,7 @@ func resourceAwsSsmActivationDelete(d *schema.ResourceData, meta interface{}) er _, err := ssmconn.DeleteActivation(params) if err != nil { - return errwrap.Wrapf("[ERROR] Error deleting SSM activation: {{err}}", err) + return fmt.Errorf("Error deleting SSM activation: %s", err) } return nil diff --git a/aws/resource_aws_ssm_association.go b/aws/resource_aws_ssm_association.go index b5dbed3963a..7a93f96a88b 100644 --- a/aws/resource_aws_ssm_association.go +++ b/aws/resource_aws_ssm_association.go @@ -131,11 +131,11 @@ func resourceAwsSsmAssociationCreate(d *schema.ResourceData, meta interface{}) e resp, err := ssmconn.CreateAssociation(associationInput) if err != nil { - return fmt.Errorf("[ERROR] Error creating SSM association: %s", err) + return fmt.Errorf("Error creating SSM association: %s", err) } if resp.AssociationDescription == nil { - return fmt.Errorf("[ERROR] AssociationDescription was nil") + return fmt.Errorf("AssociationDescription was nil") } d.SetId(*resp.AssociationDescription.AssociationId) @@ -160,10 +160,10 @@ func resourceAwsSsmAssociationRead(d *schema.ResourceData, meta interface{}) err d.SetId("") return nil } - return fmt.Errorf("[ERROR] Error reading SSM association: %s", err) + return fmt.Errorf("Error reading SSM association: %s", err) } if resp.AssociationDescription == nil { - return fmt.Errorf("[ERROR] AssociationDescription was nil") + return fmt.Errorf("AssociationDescription was nil") } association := resp.AssociationDescription @@ -176,11 +176,11 @@ func resourceAwsSsmAssociationRead(d *schema.ResourceData, meta interface{}) err d.Set("document_version", association.DocumentVersion) if err := d.Set("targets", flattenAwsSsmTargets(association.Targets)); err != nil { - return fmt.Errorf("[DEBUG] Error setting targets error: %#v", err) + return fmt.Errorf("Error setting targets error: %#v", err) } if err := d.Set("output_location", flattenAwsSsmAssociationOutoutLocation(association.OutputLocation)); err != nil { - return fmt.Errorf("[DEBUG] Error setting output_location error: %#v", err) + return fmt.Errorf("Error setting output_location error: %#v", err) } return nil @@ -222,7 +222,7 @@ func resourceAwsSsmAssociationUpdate(d *schema.ResourceData, meta interface{}) e _, err := ssmconn.UpdateAssociation(associationInput) if err != nil { - return fmt.Errorf("[ERROR] Error updating SSM association: %s", err) + return fmt.Errorf("Error updating SSM association: %s", err) } return resourceAwsSsmAssociationRead(d, meta) @@ -240,7 +240,7 @@ func resourceAwsSsmAssociationDelete(d *schema.ResourceData, meta interface{}) e _, err := ssmconn.DeleteAssociation(params) if err != nil { - return fmt.Errorf("[ERROR] Error deleting SSM association: %s", err) + return fmt.Errorf("Error deleting SSM association: %s", err) } return nil diff --git a/aws/resource_aws_ssm_document.go b/aws/resource_aws_ssm_document.go index 070ddd5a551..55d81f44f99 100644 --- a/aws/resource_aws_ssm_document.go +++ b/aws/resource_aws_ssm_document.go @@ -11,7 +11,6 @@ import ( "github.com/aws/aws-sdk-go/aws/arn" "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/service/ssm" - "github.com/hashicorp/errwrap" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/validation" @@ -172,7 +171,7 @@ func resourceAwsSsmDocumentCreate(d *schema.ResourceData, meta interface{}) erro }) if err != nil { - return errwrap.Wrapf("[ERROR] Error creating SSM document: {{err}}", err) + return fmt.Errorf("Error creating SSM document: %s", err) } if v, ok := d.GetOk("permissions"); ok && v != nil { @@ -206,7 +205,7 @@ func resourceAwsSsmDocumentRead(d *schema.ResourceData, meta interface{}) error d.SetId("") return nil } - return errwrap.Wrapf("[ERROR] Error describing SSM document: {{err}}", err) + return fmt.Errorf("Error describing SSM document: %s", err) } doc := resp.Document @@ -235,7 +234,7 @@ func resourceAwsSsmDocumentRead(d *schema.ResourceData, meta interface{}) error Resource: fmt.Sprintf("document/%s", *doc.Name), }.String() if err := d.Set("arn", arn); err != nil { - return fmt.Errorf("[DEBUG] Error setting arn error: %#v", err) + return fmt.Errorf("Error setting arn error: %#v", err) } d.Set("status", doc.Status) @@ -243,7 +242,7 @@ func resourceAwsSsmDocumentRead(d *schema.ResourceData, meta interface{}) error gp, err := getDocumentPermissions(d, meta) if err != nil { - return errwrap.Wrapf("[ERROR] Error reading SSM document permissions: {{err}}", err) + return fmt.Errorf("Error reading SSM document permissions: %s", err) } d.Set("permissions", gp) @@ -447,7 +446,7 @@ func getDocumentPermissions(d *schema.ResourceData, meta interface{}) (map[strin resp, err := ssmconn.DescribeDocumentPermission(permInput) if err != nil { - return nil, errwrap.Wrapf("[ERROR] Error setting permissions for SSM document: {{err}}", err) + return nil, fmt.Errorf("Error setting permissions for SSM document: %s", err) } var account_ids = make([]string, len(resp.AccountIds)) @@ -496,7 +495,7 @@ func deleteDocumentPermissions(d *schema.ResourceData, meta interface{}) error { _, err := ssmconn.ModifyDocumentPermission(permInput) if err != nil { - return errwrap.Wrapf("[ERROR] Error removing permissions for SSM document: {{err}}", err) + return fmt.Errorf("Error removing permissions for SSM document: %s", err) } return nil @@ -525,7 +524,7 @@ func updateAwsSSMDocument(d *schema.ResourceData, meta interface{}) error { newDefaultVersion = d.Get("latest_version").(string) } else if err != nil { - return errwrap.Wrapf("Error updating SSM document: {{err}}", err) + return fmt.Errorf("Error updating SSM document: %s", err) } else { log.Printf("[INFO] Updating the default version to the new version %s: %s", newDefaultVersion, d.Id()) newDefaultVersion = *updated.DocumentDescription.DocumentVersion @@ -539,7 +538,7 @@ func updateAwsSSMDocument(d *schema.ResourceData, meta interface{}) error { _, err = ssmconn.UpdateDocumentDefaultVersion(updateDefaultInput) if err != nil { - return errwrap.Wrapf("Error updating the default document version to that of the updated document: {{err}}", err) + return fmt.Errorf("Error updating the default document version to that of the updated document: %s", err) } return nil } diff --git a/aws/resource_aws_ssm_maintenance_window_target.go b/aws/resource_aws_ssm_maintenance_window_target.go index 868323835a0..140aa855bb1 100644 --- a/aws/resource_aws_ssm_maintenance_window_target.go +++ b/aws/resource_aws_ssm_maintenance_window_target.go @@ -109,7 +109,7 @@ func resourceAwsSsmMaintenanceWindowTargetRead(d *schema.ResourceData, meta inte d.Set("resource_type", t.ResourceType) if err := d.Set("targets", flattenAwsSsmTargets(t.Targets)); err != nil { - return fmt.Errorf("[DEBUG] Error setting targets error: %#v", err) + return fmt.Errorf("Error setting targets error: %#v", err) } } } diff --git a/aws/resource_aws_ssm_maintenance_window_task.go b/aws/resource_aws_ssm_maintenance_window_task.go index 072b5877c80..088a8ab3512 100644 --- a/aws/resource_aws_ssm_maintenance_window_task.go +++ b/aws/resource_aws_ssm_maintenance_window_task.go @@ -243,18 +243,18 @@ func resourceAwsSsmMaintenanceWindowTaskRead(d *schema.ResourceData, meta interf if t.LoggingInfo != nil { if err := d.Set("logging_info", flattenAwsSsmMaintenanceWindowLoggingInfo(t.LoggingInfo)); err != nil { - return fmt.Errorf("[DEBUG] Error setting logging_info error: %#v", err) + return fmt.Errorf("Error setting logging_info error: %#v", err) } } if t.TaskParameters != nil { if err := d.Set("task_parameters", flattenAwsSsmTaskParameters(t.TaskParameters)); err != nil { - return fmt.Errorf("[DEBUG] Error setting task_parameters error: %#v", err) + return fmt.Errorf("Error setting task_parameters error: %#v", err) } } if err := d.Set("targets", flattenAwsSsmTargets(t.Targets)); err != nil { - return fmt.Errorf("[DEBUG] Error setting targets error: %#v", err) + return fmt.Errorf("Error setting targets error: %#v", err) } } } diff --git a/aws/resource_aws_ssm_patch_baseline.go b/aws/resource_aws_ssm_patch_baseline.go index 7183190f2a9..40f97147f56 100644 --- a/aws/resource_aws_ssm_patch_baseline.go +++ b/aws/resource_aws_ssm_patch_baseline.go @@ -253,11 +253,11 @@ func resourceAwsSsmPatchBaselineRead(d *schema.ResourceData, meta interface{}) e d.Set("rejected_patches", flattenStringList(resp.RejectedPatches)) if err := d.Set("global_filter", flattenAwsSsmPatchFilterGroup(resp.GlobalFilters)); err != nil { - return fmt.Errorf("[DEBUG] Error setting global filters error: %#v", err) + return fmt.Errorf("Error setting global filters error: %#v", err) } if err := d.Set("approval_rule", flattenAwsSsmPatchRuleGroup(resp.ApprovalRules)); err != nil { - return fmt.Errorf("[DEBUG] Error setting approval rules error: %#v", err) + return fmt.Errorf("Error setting approval rules error: %#v", err) } return nil diff --git a/aws/resource_aws_volume_attachment.go b/aws/resource_aws_volume_attachment.go index 392991ee0ee..cd4ee44c1ad 100644 --- a/aws/resource_aws_volume_attachment.go +++ b/aws/resource_aws_volume_attachment.go @@ -106,7 +106,7 @@ func resourceAwsVolumeAttachmentCreate(d *schema.ResourceData, meta interface{}) _, err := conn.AttachVolume(opts) if err != nil { if awsErr, ok := err.(awserr.Error); ok { - return fmt.Errorf("[WARN] Error attaching volume (%s) to instance (%s), message: \"%s\", code: \"%s\"", + return fmt.Errorf("Error attaching volume (%s) to instance (%s), message: \"%s\", code: \"%s\"", vID, iID, awsErr.Message(), awsErr.Code()) } return err diff --git a/aws/resource_aws_vpc_endpoint.go b/aws/resource_aws_vpc_endpoint.go index 96b072f8454..45ebf5236a0 100644 --- a/aws/resource_aws_vpc_endpoint.go +++ b/aws/resource_aws_vpc_endpoint.go @@ -8,7 +8,6 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/hashicorp/errwrap" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/structure" @@ -149,7 +148,7 @@ func resourceAwsVpcEndpointCreate(d *schema.ResourceData, meta interface{}) erro if v, ok := d.GetOk("policy"); ok { policy, err := structure.NormalizeJsonString(v) if err != nil { - return errwrap.Wrapf("policy contains an invalid JSON: {{err}}", err) + return fmt.Errorf("policy contains an invalid JSON: %s", err) } req.PolicyDocument = aws.String(policy) } @@ -220,7 +219,7 @@ func resourceAwsVpcEndpointUpdate(d *schema.ResourceData, meta interface{}) erro if d.HasChange("policy") { policy, err := structure.NormalizeJsonString(d.Get("policy")) if err != nil { - return errwrap.Wrapf("policy contains an invalid JSON: {{err}}", err) + return fmt.Errorf("policy contains an invalid JSON: %s", err) } if policy == "" { @@ -375,7 +374,7 @@ func vpcEndpointAttributes(d *schema.ResourceData, vpce *ec2.VpcEndpoint, conn * policy, err := structure.NormalizeJsonString(aws.StringValue(vpce.PolicyDocument)) if err != nil { - return errwrap.Wrapf("policy contains an invalid JSON: {{err}}", err) + return fmt.Errorf("policy contains an invalid JSON: %s", err) } d.Set("policy", policy) diff --git a/aws/resource_aws_vpn_connection.go b/aws/resource_aws_vpn_connection.go index 8f8ea74d02a..9a5073c6e81 100644 --- a/aws/resource_aws_vpn_connection.go +++ b/aws/resource_aws_vpn_connection.go @@ -15,7 +15,6 @@ import ( "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/hashicorp/errwrap" "github.com/hashicorp/terraform/helper/hashcode" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" @@ -383,7 +382,7 @@ func resourceAwsVpnConnectionRead(d *schema.ResourceData, meta interface{}) erro } if len(resp.VpnConnections) != 1 { - return fmt.Errorf("[ERROR] Error finding VPN connection: %s", d.Id()) + return fmt.Errorf("Error finding VPN connection: %s", d.Id()) } vpnConnection := resp.VpnConnections[0] @@ -532,7 +531,7 @@ func telemetryToMapList(telemetry []*ec2.VgwTelemetry) []map[string]interface{} func xmlConfigToTunnelInfo(xmlConfig string) (*TunnelInfo, error) { var vpnConfig XmlVpnConnectionConfig if err := xml.Unmarshal([]byte(xmlConfig), &vpnConfig); err != nil { - return nil, errwrap.Wrapf("Error Unmarshalling XML: {{err}}", err) + return nil, fmt.Errorf("Error Unmarshalling XML: %s", err) } // don't expect consistent ordering from the XML diff --git a/aws/resource_aws_waf_byte_match_set.go b/aws/resource_aws_waf_byte_match_set.go index 6a2a7bdc641..27f976075d2 100644 --- a/aws/resource_aws_waf_byte_match_set.go +++ b/aws/resource_aws_waf_byte_match_set.go @@ -7,7 +7,6 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/service/waf" - "github.com/hashicorp/errwrap" "github.com/hashicorp/terraform/helper/schema" ) @@ -79,7 +78,7 @@ func resourceAwsWafByteMatchSetCreate(d *schema.ResourceData, meta interface{}) return conn.CreateByteMatchSet(params) }) if err != nil { - return errwrap.Wrapf("[ERROR] Error creating ByteMatchSet: {{err}}", err) + return fmt.Errorf("Error creating ByteMatchSet: %s", err) } resp := out.(*waf.CreateByteMatchSetOutput) @@ -122,7 +121,7 @@ func resourceAwsWafByteMatchSetUpdate(d *schema.ResourceData, meta interface{}) oldT, newT := o.(*schema.Set).List(), n.(*schema.Set).List() err := updateByteMatchSetResource(d.Id(), oldT, newT, conn) if err != nil { - return errwrap.Wrapf("[ERROR] Error updating ByteMatchSet: {{err}}", err) + return fmt.Errorf("Error updating ByteMatchSet: %s", err) } } @@ -151,7 +150,7 @@ func resourceAwsWafByteMatchSetDelete(d *schema.ResourceData, meta interface{}) return conn.DeleteByteMatchSet(req) }) if err != nil { - return errwrap.Wrapf("[ERROR] Error deleting ByteMatchSet: {{err}}", err) + return fmt.Errorf("Error deleting ByteMatchSet: %s", err) } return nil @@ -169,7 +168,7 @@ func updateByteMatchSetResource(id string, oldT, newT []interface{}, conn *waf.W return conn.UpdateByteMatchSet(req) }) if err != nil { - return errwrap.Wrapf("[ERROR] Error updating ByteMatchSet: {{err}}", err) + return fmt.Errorf("Error updating ByteMatchSet: %s", err) } return nil diff --git a/aws/resource_aws_waf_byte_match_set_test.go b/aws/resource_aws_waf_byte_match_set_test.go index 85e5cb4f12f..a11b12db6e1 100644 --- a/aws/resource_aws_waf_byte_match_set_test.go +++ b/aws/resource_aws_waf_byte_match_set_test.go @@ -10,7 +10,6 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/service/waf" - "github.com/hashicorp/errwrap" "github.com/hashicorp/terraform/helper/acctest" ) @@ -205,7 +204,7 @@ func testAccCheckAWSWafByteMatchSetDisappears(v *waf.ByteMatchSet) resource.Test return conn.UpdateByteMatchSet(req) }) if err != nil { - return errwrap.Wrapf("[ERROR] Error updating ByteMatchSet: {{err}}", err) + return fmt.Errorf("Error updating ByteMatchSet: %s", err) } _, err = wr.RetryWithToken(func(token *string) (interface{}, error) { @@ -216,7 +215,7 @@ func testAccCheckAWSWafByteMatchSetDisappears(v *waf.ByteMatchSet) resource.Test return conn.DeleteByteMatchSet(opts) }) if err != nil { - return errwrap.Wrapf("[ERROR] Error deleting ByteMatchSet: {{err}}", err) + return fmt.Errorf("Error deleting ByteMatchSet: %s", err) } return nil diff --git a/aws/resource_aws_waf_geo_match_set.go b/aws/resource_aws_waf_geo_match_set.go index 3eddb1d0c31..021afbf63e9 100644 --- a/aws/resource_aws_waf_geo_match_set.go +++ b/aws/resource_aws_waf_geo_match_set.go @@ -6,7 +6,6 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/waf" - "github.com/hashicorp/errwrap" "github.com/hashicorp/terraform/helper/schema" ) @@ -58,7 +57,7 @@ func resourceAwsWafGeoMatchSetCreate(d *schema.ResourceData, meta interface{}) e return conn.CreateGeoMatchSet(params) }) if err != nil { - return errwrap.Wrapf("[ERROR] Error creating GeoMatchSet: {{err}}", err) + return fmt.Errorf("Error creating GeoMatchSet: %s", err) } resp := out.(*waf.CreateGeoMatchSetOutput) @@ -102,7 +101,7 @@ func resourceAwsWafGeoMatchSetUpdate(d *schema.ResourceData, meta interface{}) e err := updateGeoMatchSetResource(d.Id(), oldT, newT, conn) if err != nil { - return errwrap.Wrapf("[ERROR] Error updating GeoMatchSet: {{err}}", err) + return fmt.Errorf("Error updating GeoMatchSet: %s", err) } } @@ -131,7 +130,7 @@ func resourceAwsWafGeoMatchSetDelete(d *schema.ResourceData, meta interface{}) e return conn.DeleteGeoMatchSet(req) }) if err != nil { - return errwrap.Wrapf("[ERROR] Error deleting GeoMatchSet: {{err}}", err) + return fmt.Errorf("Error deleting GeoMatchSet: %s", err) } return nil @@ -150,7 +149,7 @@ func updateGeoMatchSetResource(id string, oldT, newT []interface{}, conn *waf.WA return conn.UpdateGeoMatchSet(req) }) if err != nil { - return errwrap.Wrapf("[ERROR] Error updating GeoMatchSet: {{err}}", err) + return fmt.Errorf("Error updating GeoMatchSet: %s", err) } return nil diff --git a/aws/resource_aws_waf_geo_match_set_test.go b/aws/resource_aws_waf_geo_match_set_test.go index a7431fbb73c..495e7488768 100644 --- a/aws/resource_aws_waf_geo_match_set_test.go +++ b/aws/resource_aws_waf_geo_match_set_test.go @@ -9,7 +9,6 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/waf" - "github.com/hashicorp/errwrap" "github.com/hashicorp/terraform/helper/acctest" ) @@ -195,7 +194,7 @@ func testAccCheckAWSWafGeoMatchSetDisappears(v *waf.GeoMatchSet) resource.TestCh return conn.UpdateGeoMatchSet(req) }) if err != nil { - return errwrap.Wrapf("[ERROR] Error updating GeoMatchSet: {{err}}", err) + return fmt.Errorf("Error updating GeoMatchSet: %s", err) } _, err = wr.RetryWithToken(func(token *string) (interface{}, error) { @@ -206,7 +205,7 @@ func testAccCheckAWSWafGeoMatchSetDisappears(v *waf.GeoMatchSet) resource.TestCh return conn.DeleteGeoMatchSet(opts) }) if err != nil { - return errwrap.Wrapf("[ERROR] Error deleting GeoMatchSet: {{err}}", err) + return fmt.Errorf("Error deleting GeoMatchSet: %s", err) } return nil } diff --git a/aws/resource_aws_waf_size_constraint_set.go b/aws/resource_aws_waf_size_constraint_set.go index cc622854938..8fa4b8f327c 100644 --- a/aws/resource_aws_waf_size_constraint_set.go +++ b/aws/resource_aws_waf_size_constraint_set.go @@ -1,12 +1,12 @@ package aws import ( + "fmt" "log" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/service/waf" - "github.com/hashicorp/errwrap" "github.com/hashicorp/terraform/helper/schema" ) @@ -36,7 +36,7 @@ func resourceAwsWafSizeConstraintSetCreate(d *schema.ResourceData, meta interfac return conn.CreateSizeConstraintSet(params) }) if err != nil { - return errwrap.Wrapf("[ERROR] Error creating SizeConstraintSet: {{err}}", err) + return fmt.Errorf("Error creating SizeConstraintSet: %s", err) } resp := out.(*waf.CreateSizeConstraintSetOutput) @@ -78,7 +78,7 @@ func resourceAwsWafSizeConstraintSetUpdate(d *schema.ResourceData, meta interfac err := updateSizeConstraintSetResource(d.Id(), oldConstraints, newConstraints, conn) if err != nil { - return errwrap.Wrapf("[ERROR] Error updating SizeConstraintSet: {{err}}", err) + return fmt.Errorf("Error updating SizeConstraintSet: %s", err) } } @@ -94,7 +94,7 @@ func resourceAwsWafSizeConstraintSetDelete(d *schema.ResourceData, meta interfac noConstraints := []interface{}{} err := updateSizeConstraintSetResource(d.Id(), oldConstraints, noConstraints, conn) if err != nil { - return errwrap.Wrapf("[ERROR] Error deleting SizeConstraintSet: {{err}}", err) + return fmt.Errorf("Error deleting SizeConstraintSet: %s", err) } } @@ -107,7 +107,7 @@ func resourceAwsWafSizeConstraintSetDelete(d *schema.ResourceData, meta interfac return conn.DeleteSizeConstraintSet(req) }) if err != nil { - return errwrap.Wrapf("[ERROR] Error deleting SizeConstraintSet: {{err}}", err) + return fmt.Errorf("Error deleting SizeConstraintSet: %s", err) } return nil @@ -126,7 +126,7 @@ func updateSizeConstraintSetResource(id string, oldS, newS []interface{}, conn * return conn.UpdateSizeConstraintSet(req) }) if err != nil { - return errwrap.Wrapf("[ERROR] Error updating SizeConstraintSet: {{err}}", err) + return fmt.Errorf("Error updating SizeConstraintSet: %s", err) } return nil diff --git a/aws/resource_aws_waf_size_constraint_set_test.go b/aws/resource_aws_waf_size_constraint_set_test.go index 0d00d1d5943..b72208b00c7 100644 --- a/aws/resource_aws_waf_size_constraint_set_test.go +++ b/aws/resource_aws_waf_size_constraint_set_test.go @@ -10,7 +10,6 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/service/waf" - "github.com/hashicorp/errwrap" "github.com/hashicorp/terraform/helper/acctest" ) @@ -210,7 +209,7 @@ func testAccCheckAWSWafSizeConstraintSetDisappears(v *waf.SizeConstraintSet) res return conn.UpdateSizeConstraintSet(req) }) if err != nil { - return errwrap.Wrapf("[ERROR] Error updating SizeConstraintSet: {{err}}", err) + return fmt.Errorf("Error updating SizeConstraintSet: %s", err) } _, err = wr.RetryWithToken(func(token *string) (interface{}, error) { diff --git a/aws/resource_aws_waf_sql_injection_match_set.go b/aws/resource_aws_waf_sql_injection_match_set.go index 019b99bbe53..e4884486d99 100644 --- a/aws/resource_aws_waf_sql_injection_match_set.go +++ b/aws/resource_aws_waf_sql_injection_match_set.go @@ -1,12 +1,12 @@ package aws import ( + "fmt" "log" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/service/waf" - "github.com/hashicorp/errwrap" "github.com/hashicorp/terraform/helper/schema" ) @@ -71,7 +71,7 @@ func resourceAwsWafSqlInjectionMatchSetCreate(d *schema.ResourceData, meta inter return conn.CreateSqlInjectionMatchSet(params) }) if err != nil { - return errwrap.Wrapf("[ERROR] Error creating SqlInjectionMatchSet: {{err}}", err) + return fmt.Errorf("Error creating SqlInjectionMatchSet: %s", err) } resp := out.(*waf.CreateSqlInjectionMatchSetOutput) d.SetId(*resp.SqlInjectionMatchSet.SqlInjectionMatchSetId) @@ -112,7 +112,7 @@ func resourceAwsWafSqlInjectionMatchSetUpdate(d *schema.ResourceData, meta inter err := updateSqlInjectionMatchSetResource(d.Id(), oldT, newT, conn) if err != nil { - return errwrap.Wrapf("[ERROR] Error updating SqlInjectionMatchSet: {{err}}", err) + return fmt.Errorf("Error updating SqlInjectionMatchSet: %s", err) } } @@ -128,7 +128,7 @@ func resourceAwsWafSqlInjectionMatchSetDelete(d *schema.ResourceData, meta inter noTuples := []interface{}{} err := updateSqlInjectionMatchSetResource(d.Id(), oldTuples, noTuples, conn) if err != nil { - return errwrap.Wrapf("[ERROR] Error deleting SqlInjectionMatchSet: {{err}}", err) + return fmt.Errorf("Error deleting SqlInjectionMatchSet: %s", err) } } @@ -142,7 +142,7 @@ func resourceAwsWafSqlInjectionMatchSetDelete(d *schema.ResourceData, meta inter return conn.DeleteSqlInjectionMatchSet(req) }) if err != nil { - return errwrap.Wrapf("[ERROR] Error deleting SqlInjectionMatchSet: {{err}}", err) + return fmt.Errorf("Error deleting SqlInjectionMatchSet: %s", err) } return nil @@ -161,7 +161,7 @@ func updateSqlInjectionMatchSetResource(id string, oldT, newT []interface{}, con return conn.UpdateSqlInjectionMatchSet(req) }) if err != nil { - return errwrap.Wrapf("[ERROR] Error updating SqlInjectionMatchSet: {{err}}", err) + return fmt.Errorf("Error updating SqlInjectionMatchSet: %s", err) } return nil diff --git a/aws/resource_aws_waf_sql_injection_match_set_test.go b/aws/resource_aws_waf_sql_injection_match_set_test.go index 1a3062a4498..e196f4925b2 100644 --- a/aws/resource_aws_waf_sql_injection_match_set_test.go +++ b/aws/resource_aws_waf_sql_injection_match_set_test.go @@ -10,7 +10,6 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/service/waf" - "github.com/hashicorp/errwrap" "github.com/hashicorp/terraform/helper/acctest" ) @@ -196,7 +195,7 @@ func testAccCheckAWSWafSqlInjectionMatchSetDisappears(v *waf.SqlInjectionMatchSe return conn.UpdateSqlInjectionMatchSet(req) }) if err != nil { - return errwrap.Wrapf("[ERROR] Error updating SqlInjectionMatchSet: {{err}}", err) + return fmt.Errorf("Error updating SqlInjectionMatchSet: %s", err) } _, err = wr.RetryWithToken(func(token *string) (interface{}, error) { @@ -207,7 +206,7 @@ func testAccCheckAWSWafSqlInjectionMatchSetDisappears(v *waf.SqlInjectionMatchSe return conn.DeleteSqlInjectionMatchSet(opts) }) if err != nil { - return errwrap.Wrapf("[ERROR] Error deleting SqlInjectionMatchSet: {{err}}", err) + return fmt.Errorf("Error deleting SqlInjectionMatchSet: %s", err) } return nil } diff --git a/aws/resource_aws_waf_xss_match_set.go b/aws/resource_aws_waf_xss_match_set.go index f74eab1237e..af1864c08e5 100644 --- a/aws/resource_aws_waf_xss_match_set.go +++ b/aws/resource_aws_waf_xss_match_set.go @@ -7,7 +7,6 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/service/waf" - "github.com/hashicorp/errwrap" "github.com/hashicorp/terraform/helper/schema" ) @@ -72,7 +71,7 @@ func resourceAwsWafXssMatchSetCreate(d *schema.ResourceData, meta interface{}) e return conn.CreateXssMatchSet(params) }) if err != nil { - return errwrap.Wrapf("[ERROR] Error creating XssMatchSet: {{err}}", err) + return fmt.Errorf("Error creating XssMatchSet: %s", err) } resp := out.(*waf.CreateXssMatchSetOutput) @@ -114,7 +113,7 @@ func resourceAwsWafXssMatchSetUpdate(d *schema.ResourceData, meta interface{}) e err := updateXssMatchSetResource(d.Id(), oldT, newT, conn) if err != nil { - return errwrap.Wrapf("[ERROR] Error updating XssMatchSet: {{err}}", err) + return fmt.Errorf("Error updating XssMatchSet: %s", err) } } @@ -143,7 +142,7 @@ func resourceAwsWafXssMatchSetDelete(d *schema.ResourceData, meta interface{}) e return conn.DeleteXssMatchSet(req) }) if err != nil { - return errwrap.Wrapf("[ERROR] Error deleting XssMatchSet: {{err}}", err) + return fmt.Errorf("Error deleting XssMatchSet: %s", err) } return nil @@ -162,7 +161,7 @@ func updateXssMatchSetResource(id string, oldT, newT []interface{}, conn *waf.WA return conn.UpdateXssMatchSet(req) }) if err != nil { - return errwrap.Wrapf("[ERROR] Error updating XssMatchSet: {{err}}", err) + return fmt.Errorf("Error updating XssMatchSet: %s", err) } return nil diff --git a/aws/resource_aws_waf_xss_match_set_test.go b/aws/resource_aws_waf_xss_match_set_test.go index debb32d40f8..2e58314aae0 100644 --- a/aws/resource_aws_waf_xss_match_set_test.go +++ b/aws/resource_aws_waf_xss_match_set_test.go @@ -10,7 +10,6 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/service/waf" - "github.com/hashicorp/errwrap" "github.com/hashicorp/terraform/helper/acctest" ) @@ -220,7 +219,7 @@ func testAccCheckAWSWafXssMatchSetDisappears(v *waf.XssMatchSet) resource.TestCh return conn.UpdateXssMatchSet(req) }) if err != nil { - return errwrap.Wrapf("[ERROR] Error updating XssMatchSet: {{err}}", err) + return fmt.Errorf("Error updating XssMatchSet: %s", err) } _, err = wr.RetryWithToken(func(token *string) (interface{}, error) { @@ -231,7 +230,7 @@ func testAccCheckAWSWafXssMatchSetDisappears(v *waf.XssMatchSet) resource.TestCh return conn.DeleteXssMatchSet(opts) }) if err != nil { - return errwrap.Wrapf("[ERROR] Error deleting XssMatchSet: {{err}}", err) + return fmt.Errorf("Error deleting XssMatchSet: %s", err) } return nil } diff --git a/aws/resource_aws_wafregional_byte_match_set.go b/aws/resource_aws_wafregional_byte_match_set.go index a7e621f5d48..dea71c168d8 100644 --- a/aws/resource_aws_wafregional_byte_match_set.go +++ b/aws/resource_aws_wafregional_byte_match_set.go @@ -1,13 +1,13 @@ package aws import ( + "fmt" "log" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/service/waf" "github.com/aws/aws-sdk-go/service/wafregional" - "github.com/hashicorp/errwrap" "github.com/hashicorp/terraform/helper/schema" ) @@ -120,7 +120,7 @@ func resourceAwsWafRegionalByteMatchSetCreate(d *schema.ResourceData, meta inter }) if err != nil { - return errwrap.Wrapf("[ERROR] Error creating ByteMatchSet: {{err}}", err) + return fmt.Errorf("Error creating ByteMatchSet: %s", err) } resp := out.(*waf.CreateByteMatchSetOutput) @@ -200,7 +200,7 @@ func resourceAwsWafRegionalByteMatchSetUpdate(d *schema.ResourceData, meta inter err := updateByteMatchSetResourceWR(d, oldT, newT, conn, region) if err != nil { - return errwrap.Wrapf("[ERROR] Error updating ByteMatchSet: {{err}}", err) + return fmt.Errorf("Error updating ByteMatchSet: %s", err) } } else if d.HasChange("byte_match_tuples") { o, n := d.GetChange("byte_match_tuples") @@ -208,7 +208,7 @@ func resourceAwsWafRegionalByteMatchSetUpdate(d *schema.ResourceData, meta inter err := updateByteMatchSetResourceWR(d, oldT, newT, conn, region) if err != nil { - return errwrap.Wrapf("[ERROR] Error updating ByteMatchSet: {{err}}", err) + return fmt.Errorf("Error updating ByteMatchSet: %s", err) } } return resourceAwsWafRegionalByteMatchSetRead(d, meta) @@ -232,7 +232,7 @@ func resourceAwsWafRegionalByteMatchSetDelete(d *schema.ResourceData, meta inter err := updateByteMatchSetResourceWR(d, oldT, newT, conn, region) if err != nil { - return errwrap.Wrapf("[ERROR] Error deleting ByteMatchSet: {{err}}", err) + return fmt.Errorf("Error deleting ByteMatchSet: %s", err) } } @@ -245,7 +245,7 @@ func resourceAwsWafRegionalByteMatchSetDelete(d *schema.ResourceData, meta inter return conn.DeleteByteMatchSet(req) }) if err != nil { - return errwrap.Wrapf("[ERROR] Error deleting ByteMatchSet: {{err}}", err) + return fmt.Errorf("Error deleting ByteMatchSet: %s", err) } return nil @@ -263,7 +263,7 @@ func updateByteMatchSetResourceWR(d *schema.ResourceData, oldT, newT []interface return conn.UpdateByteMatchSet(req) }) if err != nil { - return errwrap.Wrapf("[ERROR] Error updating ByteMatchSet: {{err}}", err) + return fmt.Errorf("Error updating ByteMatchSet: %s", err) } return nil diff --git a/aws/resource_aws_wafregional_byte_match_set_test.go b/aws/resource_aws_wafregional_byte_match_set_test.go index ff2dafef124..62afcaec66f 100644 --- a/aws/resource_aws_wafregional_byte_match_set_test.go +++ b/aws/resource_aws_wafregional_byte_match_set_test.go @@ -10,7 +10,6 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/service/waf" - "github.com/hashicorp/errwrap" "github.com/hashicorp/terraform/helper/acctest" ) @@ -274,7 +273,7 @@ func testAccCheckAWSWafRegionalByteMatchSetDisappears(v *waf.ByteMatchSet) resou return conn.UpdateByteMatchSet(req) }) if err != nil { - return errwrap.Wrapf("[ERROR] Error updating ByteMatchSet: {{err}}", err) + return fmt.Errorf("Error updating ByteMatchSet: %s", err) } _, err = wr.RetryWithToken(func(token *string) (interface{}, error) { @@ -285,7 +284,7 @@ func testAccCheckAWSWafRegionalByteMatchSetDisappears(v *waf.ByteMatchSet) resou return conn.DeleteByteMatchSet(opts) }) if err != nil { - return errwrap.Wrapf("[ERROR] Error deleting ByteMatchSet: {{err}}", err) + return fmt.Errorf("Error deleting ByteMatchSet: %s", err) } return nil diff --git a/aws/resource_aws_wafregional_size_constraint_set.go b/aws/resource_aws_wafregional_size_constraint_set.go index 6298666db34..904547d1817 100644 --- a/aws/resource_aws_wafregional_size_constraint_set.go +++ b/aws/resource_aws_wafregional_size_constraint_set.go @@ -39,7 +39,7 @@ func resourceAwsWafRegionalSizeConstraintSetCreate(d *schema.ResourceData, meta return conn.CreateSizeConstraintSet(params) }) if err != nil { - return fmt.Errorf("[ERROR] Error creating WAF Regional SizeConstraintSet: %s", err) + return fmt.Errorf("Error creating WAF Regional SizeConstraintSet: %s", err) } resp := out.(*waf.CreateSizeConstraintSetOutput) @@ -80,7 +80,7 @@ func resourceAwsWafRegionalSizeConstraintSetUpdate(d *schema.ResourceData, meta oldConstraints, newConstraints := o.(*schema.Set).List(), n.(*schema.Set).List() if err := updateRegionalSizeConstraintSetResource(d.Id(), oldConstraints, newConstraints, client.wafregionalconn, client.region); err != nil { - return fmt.Errorf("[ERROR] Error updating WAF Regional SizeConstraintSet: %s", err) + return fmt.Errorf("Error updating WAF Regional SizeConstraintSet: %s", err) } } @@ -96,7 +96,7 @@ func resourceAwsWafRegionalSizeConstraintSetDelete(d *schema.ResourceData, meta if len(oldConstraints) > 0 { noConstraints := []interface{}{} if err := updateRegionalSizeConstraintSetResource(d.Id(), oldConstraints, noConstraints, conn, region); err != nil { - return fmt.Errorf("[ERROR] Error deleting WAF Regional SizeConstraintSet: %s", err) + return fmt.Errorf("Error deleting WAF Regional SizeConstraintSet: %s", err) } } @@ -109,7 +109,7 @@ func resourceAwsWafRegionalSizeConstraintSetDelete(d *schema.ResourceData, meta return conn.DeleteSizeConstraintSet(req) }) if err != nil { - return fmt.Errorf("[ERROR] Error deleting WAF Regional SizeConstraintSet: %s", err) + return fmt.Errorf("Error deleting WAF Regional SizeConstraintSet: %s", err) } return nil @@ -128,7 +128,7 @@ func updateRegionalSizeConstraintSetResource(id string, oldConstraints, newConst return conn.UpdateSizeConstraintSet(req) }) if err != nil { - return fmt.Errorf("[ERROR] Error updating WAF Regional SizeConstraintSet: %s", err) + return fmt.Errorf("Error updating WAF Regional SizeConstraintSet: %s", err) } return nil diff --git a/aws/resource_aws_wafregional_size_constraint_set_test.go b/aws/resource_aws_wafregional_size_constraint_set_test.go index 4b3b098859a..41ea4b5482b 100644 --- a/aws/resource_aws_wafregional_size_constraint_set_test.go +++ b/aws/resource_aws_wafregional_size_constraint_set_test.go @@ -10,7 +10,6 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/waf" "github.com/aws/aws-sdk-go/service/wafregional" - "github.com/hashicorp/errwrap" "github.com/hashicorp/terraform/helper/acctest" ) @@ -211,7 +210,7 @@ func testAccCheckAWSWafRegionalSizeConstraintSetDisappears(constraints *waf.Size return conn.UpdateSizeConstraintSet(req) }) if err != nil { - return errwrap.Wrapf("[ERROR] Error updating SizeConstraintSet: {{err}}", err) + return fmt.Errorf("Error updating SizeConstraintSet: %s", err) } _, err = wr.RetryWithToken(func(token *string) (interface{}, error) { diff --git a/aws/resource_aws_wafregional_sql_injection_match_set.go b/aws/resource_aws_wafregional_sql_injection_match_set.go index f7d23c9c2a6..43e4554e75a 100644 --- a/aws/resource_aws_wafregional_sql_injection_match_set.go +++ b/aws/resource_aws_wafregional_sql_injection_match_set.go @@ -122,7 +122,7 @@ func resourceAwsWafRegionalSqlInjectionMatchSetUpdate(d *schema.ResourceData, me err := updateSqlInjectionMatchSetResourceWR(d.Id(), oldT, newT, conn, region) if err != nil { - return fmt.Errorf("[ERROR] Error updating Regional WAF SQL Injection Match Set: %s", err) + return fmt.Errorf("Error updating Regional WAF SQL Injection Match Set: %s", err) } } @@ -139,7 +139,7 @@ func resourceAwsWafRegionalSqlInjectionMatchSetDelete(d *schema.ResourceData, me noTuples := []interface{}{} err := updateSqlInjectionMatchSetResourceWR(d.Id(), oldTuples, noTuples, conn, region) if err != nil { - return fmt.Errorf("[ERROR] Error deleting Regional WAF SQL Injection Match Set: %s", err) + return fmt.Errorf("Error deleting Regional WAF SQL Injection Match Set: %s", err) } } diff --git a/aws/resource_aws_wafregional_xss_match_set_test.go b/aws/resource_aws_wafregional_xss_match_set_test.go index fe8b5edf830..a109927f78c 100644 --- a/aws/resource_aws_wafregional_xss_match_set_test.go +++ b/aws/resource_aws_wafregional_xss_match_set_test.go @@ -7,7 +7,6 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/waf" "github.com/aws/aws-sdk-go/service/wafregional" - "github.com/hashicorp/errwrap" "github.com/hashicorp/terraform/helper/acctest" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" @@ -220,7 +219,7 @@ func testAccCheckAWSWafRegionalXssMatchSetDisappears(v *waf.XssMatchSet) resourc return conn.UpdateXssMatchSet(req) }) if err != nil { - return errwrap.Wrapf("[ERROR] Error updating regional WAF XSS Match Set: {{err}}", err) + return fmt.Errorf("Error updating regional WAF XSS Match Set: %s", err) } _, err = wr.RetryWithToken(func(token *string) (interface{}, error) { @@ -231,7 +230,7 @@ func testAccCheckAWSWafRegionalXssMatchSetDisappears(v *waf.XssMatchSet) resourc return conn.DeleteXssMatchSet(opts) }) if err != nil { - return errwrap.Wrapf("[ERROR] Error deleting regional WAF XSS Match Set: {{err}}", err) + return fmt.Errorf("Error deleting regional WAF XSS Match Set: %s", err) } return nil } diff --git a/aws/structure.go b/aws/structure.go index 4bd9b10b8ef..266da93e6b1 100644 --- a/aws/structure.go +++ b/aws/structure.go @@ -85,7 +85,7 @@ func expandListeners(configured []interface{}) ([]*elb.Listener, error) { if valid { listeners = append(listeners, l) } else { - return nil, fmt.Errorf("[ERR] ELB Listener: ssl_certificate_id may be set only when protocol is 'https' or 'ssl'") + return nil, fmt.Errorf("ELB Listener: ssl_certificate_id may be set only when protocol is 'https' or 'ssl'") } } diff --git a/aws/tagsNeptune.go b/aws/tagsNeptune.go index 3c54716c9ff..8f47bb3d833 100644 --- a/aws/tagsNeptune.go +++ b/aws/tagsNeptune.go @@ -121,7 +121,7 @@ func saveTagsNeptune(conn *neptune.Neptune, d *schema.ResourceData, arn string) }) if err != nil { - return fmt.Errorf("[DEBUG] Error retreiving tags for ARN: %s", arn) + return fmt.Errorf("Error retreiving tags for ARN: %s", arn) } var dt []*neptune.Tag diff --git a/aws/tagsRDS.go b/aws/tagsRDS.go index 2d64113482b..ef7a869d383 100644 --- a/aws/tagsRDS.go +++ b/aws/tagsRDS.go @@ -107,7 +107,7 @@ func saveTagsRDS(conn *rds.RDS, d *schema.ResourceData, arn string) error { }) if err != nil { - return fmt.Errorf("[DEBUG] Error retreiving tags for ARN: %s", arn) + return fmt.Errorf("Error retreiving tags for ARN: %s", arn) } var dt []*rds.Tag diff --git a/aws/tags_dms_test.go b/aws/tags_dms_test.go index 630ace37296..78388f74dd1 100644 --- a/aws/tags_dms_test.go +++ b/aws/tags_dms_test.go @@ -1,11 +1,11 @@ package aws import ( + "reflect" "testing" "github.com/aws/aws-sdk-go/aws" dms "github.com/aws/aws-sdk-go/service/databasemigrationservice" - "reflect" ) func TestDmsTagsToMap(t *testing.T) { diff --git a/aws/waf_token_handlers.go b/aws/waf_token_handlers.go index ac99f09507e..2b14b01bcae 100644 --- a/aws/waf_token_handlers.go +++ b/aws/waf_token_handlers.go @@ -1,11 +1,11 @@ package aws import ( + "fmt" "time" "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/service/waf" - "github.com/hashicorp/errwrap" "github.com/hashicorp/terraform/helper/resource" ) @@ -27,7 +27,7 @@ func (t *WafRetryer) RetryWithToken(f withTokenFunc) (interface{}, error) { tokenOut, err = t.Connection.GetChangeToken(&waf.GetChangeTokenInput{}) if err != nil { - return resource.NonRetryableError(errwrap.Wrapf("Failed to acquire change token: {{err}}", err)) + return resource.NonRetryableError(fmt.Errorf("Failed to acquire change token: %s", err)) } out, err = f(tokenOut.ChangeToken) diff --git a/aws/wafregionl_token_handlers.go b/aws/wafregionl_token_handlers.go index da3d8b58f78..17c69c0f969 100644 --- a/aws/wafregionl_token_handlers.go +++ b/aws/wafregionl_token_handlers.go @@ -1,12 +1,12 @@ package aws import ( + "fmt" "time" "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/service/waf" "github.com/aws/aws-sdk-go/service/wafregional" - "github.com/hashicorp/errwrap" "github.com/hashicorp/terraform/helper/resource" ) @@ -28,7 +28,7 @@ func (t *WafRegionalRetryer) RetryWithToken(f withRegionalTokenFunc) (interface{ tokenOut, err = t.Connection.GetChangeToken(&waf.GetChangeTokenInput{}) if err != nil { - return resource.NonRetryableError(errwrap.Wrapf("Failed to acquire change token: {{err}}", err)) + return resource.NonRetryableError(fmt.Errorf("Failed to acquire change token: %s", err)) } out, err = f(tokenOut.ChangeToken) From 5b3410404873b39662f886a13579e77b0c1aab9b Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Sun, 16 Sep 2018 12:52:30 -0400 Subject: [PATCH 152/184] Update CHANGELOG for #5883 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ce6ac8bfa8c..162e5d82521 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ BUG FIXES: * resource/aws_config_config_rule: Prevent panic when specifying empty `scope` [GH-5852] * resource/aws_iam_policy: Ensure `description` is properly read into Terraform state during resource creation [GH-5884] +* resource/aws_launch_template: Fix handling of `network_interface` `ipv6_addresses` [GH-5883] * resource/aws_s3_bucket: Prevent panics with various API read failures [GH-5842] * resource/aws_s3_bucket: Prevent `NoSuchBucket` error on deletion [GH-5842] From 0b518be81d911b268a3a92cfea687294915e8ca2 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Sun, 16 Sep 2018 15:31:50 -0400 Subject: [PATCH 153/184] resource/aws_redshift_cluster: Properly disable logging when using logging nested argument This is a quick fix until the deprecated `enabled_logging`, etc. arguments are removed in the next major version. Previously, when switching from logging being enabled to disabled, the update function would errantly reference both the deprecated `enable_logging` value from state (which would be true) and the new value `logging.0.enable` from configuration (which would be false) with a logical OR to determine whether logging should be enabled or disabled. We now treat the handling between the logging and deprecated arguments separately. The reason this was not previously handled was that the existing acceptance testing had a race condition that meant the EnableLogging call would not error if DeleteBucket had not been called yet, but otherwise could fail with: ``` --- FAIL: TestAccAWSRedshiftCluster_loggingEnabled (1157.85s) testing.go:527: Step 1 error: Error applying: 1 error occurred: * aws_redshift_cluster.default: 1 error occurred: * aws_redshift_cluster.default: BucketNotFoundFault: Could not find bucket with name tf-redshift-logging-5762787809933873609 ``` Now the testing passes and verified that `DisableLogging` is correctly called in both tests: ``` --- PASS: TestAccAWSRedshiftCluster_loggingEnabled (1377.47s) --- PASS: TestAccAWSRedshiftCluster_loggingEnabledDeprecated (1587.61s) ``` --- aws/resource_aws_redshift_cluster.go | 41 ++++++++++++++++------------ 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/aws/resource_aws_redshift_cluster.go b/aws/resource_aws_redshift_cluster.go index 4fe7d0592f4..b19eb6ab081 100644 --- a/aws/resource_aws_redshift_cluster.go +++ b/aws/resource_aws_redshift_cluster.go @@ -787,31 +787,38 @@ func resourceAwsRedshiftClusterUpdate(d *schema.ResourceData, meta interface{}) } } - deprecatedHasChange := (d.HasChange("enable_logging") || d.HasChange("bucket_name") || d.HasChange("s3_key_prefix")) - if d.HasChange("logging") || deprecatedHasChange { - var loggingErr error - - logging, ok := d.GetOk("logging.0.enable") - _, deprecatedOk := d.GetOk("enable_logging") - - if (ok && logging.(bool)) || deprecatedOk { + if d.HasChange("logging") { + if loggingEnabled, ok := d.GetOk("logging.0.enable"); ok && loggingEnabled.(bool) { log.Printf("[INFO] Enabling Logging for Redshift Cluster %q", d.Id()) - loggingErr = enableRedshiftClusterLogging(d, conn) - if loggingErr != nil { - return loggingErr + err := enableRedshiftClusterLogging(d, conn) + if err != nil { + return err } } else { log.Printf("[INFO] Disabling Logging for Redshift Cluster %q", d.Id()) - _, loggingErr = conn.DisableLogging(&redshift.DisableLoggingInput{ + _, err := conn.DisableLogging(&redshift.DisableLoggingInput{ ClusterIdentifier: aws.String(d.Id()), }) - if loggingErr != nil { - return loggingErr + if err != nil { + return err + } + } + } else if d.HasChange("enable_logging") || d.HasChange("bucket_name") || d.HasChange("s3_key_prefix") { + if enableLogging, ok := d.GetOk("enable_logging"); ok && enableLogging.(bool) { + log.Printf("[INFO] Enabling Logging for Redshift Cluster %q", d.Id()) + err := enableRedshiftClusterLogging(d, conn) + if err != nil { + return err + } + } else { + log.Printf("[INFO] Disabling Logging for Redshift Cluster %q", d.Id()) + _, err := conn.DisableLogging(&redshift.DisableLoggingInput{ + ClusterIdentifier: aws.String(d.Id()), + }) + if err != nil { + return err } } - - d.SetPartial("enable_logging") - d.SetPartial("logging") } d.Partial(false) From 270c7c169e82dfe3aa0418564b5f1cfd2bfcd0d4 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Sun, 16 Sep 2018 14:25:24 -0400 Subject: [PATCH 154/184] tests/ec2: Enhance sweepers for VPC deletion While attempting to clean up `tf-acc-test-*` VPC resources, ran into missing functionality with the existing sweepers. Changes: * Add aws_route_table test sweeper * Loop through Internet Gateway attachments and complete detachments before attempting deletion * Add `tf-acc-test-*` to test sweepers for aws_internet_gateway, aws_nat_gateway, aws_security_group, aws_vpc, and aws_vpn_gateway Previously (before fixing aws_internet_gateway sweeper): ``` 2018/09/16 13:38:32 [ERR] error running (aws_vpc): Error deleting Internet Gateway (igw-05927556b524fb89a): DependencyViolation: The internetGateway 'igw-05927556b524fb89a' has dependencies and cannot be deleted. ``` Previously (before adding aws_route_table sweeper): ``` 2018/09/16 14:02:57 [ERR] error running (aws_vpc): Error deleting VPC (vpc-0bf9aa31cc08f54b3): DependencyViolation: The vpc 'vpc-0bf9aa31cc08f54b3' has dependencies and cannot be deleted. ``` Now: ``` $ make sweep SWEEP=us-west-2 SWEEPARGS='-sweep-run=aws_vpc' ... 2018/09/16 14:16:39 [DEBUG] Deleting VPC: { VpcId: "vpc-0bf9aa31cc08f54b3" } ... 2018/09/16 14:16:51 Sweeper Tests ran: - aws_elb - aws_subnet - aws_route_table - aws_batch_compute_environment - aws_beanstalk_environment - aws_elasticsearch_domain - aws_elasticache_replication_group - aws_security_group - aws_batch_job_queue - aws_db_instance - aws_eks_cluster - aws_lb - aws_redshift_cluster - aws_spot_fleet_request - aws_vpn_gateway - aws_nat_gateway - aws_elasticache_cluster - aws_instance - aws_lambda_function - aws_vpc - aws_internet_gateway - aws_network_acl - aws_autoscaling_group - aws_mq_broker ok github.com/terraform-providers/terraform-provider-aws/aws 117.935s ``` --- aws/resource_aws_internet_gateway_test.go | 39 +++++++++++++--- aws/resource_aws_nat_gateway_test.go | 1 + aws/resource_aws_route_table_test.go | 55 +++++++++++++++++++++++ aws/resource_aws_security_group_test.go | 7 ++- aws/resource_aws_vpc_test.go | 2 + aws/resource_aws_vpn_gateway_test.go | 1 + 6 files changed, 98 insertions(+), 7 deletions(-) diff --git a/aws/resource_aws_internet_gateway_test.go b/aws/resource_aws_internet_gateway_test.go index 498c637ea33..f0c57284cef 100644 --- a/aws/resource_aws_internet_gateway_test.go +++ b/aws/resource_aws_internet_gateway_test.go @@ -4,6 +4,7 @@ import ( "fmt" "log" "testing" + "time" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/awserr" @@ -32,6 +33,7 @@ func testSweepInternetGateways(region string) error { Name: aws.String("tag-value"), Values: []*string{ aws.String("terraform-testacc-*"), + aws.String("tf-acc-test-*"), }, }, }, @@ -51,13 +53,40 @@ func testSweepInternetGateways(region string) error { } for _, internetGateway := range resp.InternetGateways { - _, err := conn.DeleteInternetGateway(&ec2.DeleteInternetGatewayInput{ + for _, attachment := range internetGateway.Attachments { + input := &ec2.DetachInternetGatewayInput{ + InternetGatewayId: internetGateway.InternetGatewayId, + VpcId: attachment.VpcId, + } + + log.Printf("[DEBUG] Detaching Internet Gateway: %s", input) + _, err := conn.DetachInternetGateway(input) + if err != nil { + return fmt.Errorf("error detaching Internet Gateway (%s) from VPC (%s): %s", aws.StringValue(internetGateway.InternetGatewayId), aws.StringValue(attachment.VpcId), err) + } + + stateConf := &resource.StateChangeConf{ + Pending: []string{"detaching"}, + Target: []string{"detached"}, + Refresh: detachIGStateRefreshFunc(conn, aws.StringValue(internetGateway.InternetGatewayId), aws.StringValue(attachment.VpcId)), + Timeout: 10 * time.Minute, + Delay: 10 * time.Second, + } + + log.Printf("[DEBUG] Waiting for Internet Gateway (%s) to detach from VPC (%s)", aws.StringValue(internetGateway.InternetGatewayId), aws.StringValue(attachment.VpcId)) + if _, err = stateConf.WaitForState(); err != nil { + return fmt.Errorf("error waiting for VPN Gateway (%s) to detach from VPC (%s): %s", aws.StringValue(internetGateway.InternetGatewayId), aws.StringValue(attachment.VpcId), err) + } + } + + input := &ec2.DeleteInternetGatewayInput{ InternetGatewayId: internetGateway.InternetGatewayId, - }) + } + + log.Printf("[DEBUG] Deleting Internet Gateway: %s", input) + _, err := conn.DeleteInternetGateway(input) if err != nil { - return fmt.Errorf( - "Error deleting Internet Gateway (%s): %s", - *internetGateway.InternetGatewayId, err) + return fmt.Errorf("error deleting Internet Gateway (%s): %s", aws.StringValue(internetGateway.InternetGatewayId), err) } } diff --git a/aws/resource_aws_nat_gateway_test.go b/aws/resource_aws_nat_gateway_test.go index eb2b8edadab..31a4cec66bc 100644 --- a/aws/resource_aws_nat_gateway_test.go +++ b/aws/resource_aws_nat_gateway_test.go @@ -33,6 +33,7 @@ func testSweepNatGateways(region string) error { Name: aws.String("tag-value"), Values: []*string{ aws.String("terraform-testacc-*"), + aws.String("tf-acc-test-*"), }, }, }, diff --git a/aws/resource_aws_route_table_test.go b/aws/resource_aws_route_table_test.go index c1d51fce11b..2c4e27dc195 100644 --- a/aws/resource_aws_route_table_test.go +++ b/aws/resource_aws_route_table_test.go @@ -2,6 +2,7 @@ package aws import ( "fmt" + "log" "regexp" "testing" @@ -12,6 +13,60 @@ import ( "github.com/hashicorp/terraform/terraform" ) +func init() { + resource.AddTestSweepers("aws_route_table", &resource.Sweeper{ + Name: "aws_route_table", + F: testSweepRouteTables, + }) +} + +func testSweepRouteTables(region string) error { + client, err := sharedClientForRegion(region) + if err != nil { + return fmt.Errorf("error getting client: %s", err) + } + conn := client.(*AWSClient).ec2conn + + req := &ec2.DescribeRouteTablesInput{ + Filters: []*ec2.Filter{ + { + Name: aws.String("tag-value"), + Values: []*string{ + aws.String("terraform-testacc-*"), + aws.String("tf-acc-test-*"), + }, + }, + }, + } + resp, err := conn.DescribeRouteTables(req) + if err != nil { + if testSweepSkipSweepError(err) { + log.Printf("[WARN] Skipping EC2 Route Table sweep for %s: %s", region, err) + return nil + } + return fmt.Errorf("Error describing Route Tables: %s", err) + } + + if len(resp.RouteTables) == 0 { + log.Print("[DEBUG] No Route Tables to sweep") + return nil + } + + for _, routeTable := range resp.RouteTables { + input := &ec2.DeleteRouteTableInput{ + RouteTableId: routeTable.RouteTableId, + } + + log.Printf("[DEBUG] Deleting Route Table: %s", input) + _, err := conn.DeleteRouteTable(input) + if err != nil { + return fmt.Errorf("error deleting Route Table (%s): %s", aws.StringValue(routeTable.RouteTableId), err) + } + } + + return nil +} + func TestAccAWSRouteTable_basic(t *testing.T) { var v ec2.RouteTable diff --git a/aws/resource_aws_security_group_test.go b/aws/resource_aws_security_group_test.go index 8301b49589c..f00748204da 100644 --- a/aws/resource_aws_security_group_test.go +++ b/aws/resource_aws_security_group_test.go @@ -36,8 +36,11 @@ func testSweepSecurityGroups(region string) error { req := &ec2.DescribeSecurityGroupsInput{ Filters: []*ec2.Filter{ { - Name: aws.String("tag-value"), - Values: []*string{aws.String("tf-acc-revoke*")}, + Name: aws.String("tag-value"), + Values: []*string{ + aws.String("tf-acc-revoke*"), + aws.String("tf-acc-test-*"), + }, }, }, } diff --git a/aws/resource_aws_vpc_test.go b/aws/resource_aws_vpc_test.go index 91162a33bab..781af7322c0 100644 --- a/aws/resource_aws_vpc_test.go +++ b/aws/resource_aws_vpc_test.go @@ -21,6 +21,7 @@ func init() { "aws_internet_gateway", "aws_nat_gateway", "aws_network_acl", + "aws_route_table", "aws_security_group", "aws_subnet", "aws_vpn_gateway", @@ -42,6 +43,7 @@ func testSweepVPCs(region string) error { Name: aws.String("tag-value"), Values: []*string{ aws.String("terraform-testacc-*"), + aws.String("tf-acc-test-*"), }, }, }, diff --git a/aws/resource_aws_vpn_gateway_test.go b/aws/resource_aws_vpn_gateway_test.go index 239068ee400..f6567e04992 100644 --- a/aws/resource_aws_vpn_gateway_test.go +++ b/aws/resource_aws_vpn_gateway_test.go @@ -34,6 +34,7 @@ func testSweepVPNGateways(region string) error { Name: aws.String("tag-value"), Values: []*string{ aws.String("terraform-testacc-*"), + aws.String("tf-acc-test-*"), }, }, }, From 39e0fd4d486dc63522ad30331a29e64d53080074 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Fri, 14 Sep 2018 20:10:42 -0400 Subject: [PATCH 155/184] provider: Lift and shift import_*_test.go code into resource_*_test.go files Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/4705 Previously and currently: ``` $ go test -list . ./aws | wc -l 2530 ``` --- aws/import_aws_api_gateway_account_test.go | 28 --- aws/import_aws_api_gateway_key_test.go | 28 --- aws/import_aws_api_gateway_usage_plan_test.go | 30 --- aws/import_aws_autoscaling_group_test.go | 33 --- ...import_aws_cloudfront_distribution_test.go | 32 --- ..._cloudfront_origin_access_identity_test.go | 28 --- aws/import_aws_cloudtrail_test.go | 31 --- aws/import_aws_cloudwatch_dashboard_test.go | 29 --- aws/import_aws_cloudwatch_event_rule_test.go | 29 --- ..._cloudwatch_log_destination_policy_test.go | 31 --- ...ort_aws_cloudwatch_log_destination_test.go | 31 --- aws/import_aws_cloudwatch_log_group_test.go | 31 --- ...import_aws_cloudwatch_metric_alarm_test.go | 30 --- aws/import_aws_codebuild_project_test.go | 29 --- aws/import_aws_codecommit_repository_test.go | 29 --- aws/import_aws_codepipeline_test.go | 34 --- aws/import_aws_cognito_identity_pool_test.go | 30 --- aws/import_aws_cognito_user_pool_test.go | 29 --- aws/import_aws_customer_gateway_test.go | 31 --- aws/import_aws_dax_cluster_test.go | 30 --- aws/import_aws_db_event_subscription_test.go | 33 --- aws/import_aws_db_instance_test.go | 33 --- aws/import_aws_db_option_group_test.go | 31 --- ...mport_aws_db_parameter_group_group_test.go | 31 --- aws/import_aws_db_security_group_test.go | 36 --- aws/import_aws_db_subnet_group_test.go | 33 --- aws/import_aws_dx_connection_test.go | 29 --- aws/import_aws_dx_gateway_test.go | 58 ----- aws/import_aws_dx_lag_test.go | 30 --- aws/import_aws_dynamodb_table_test.go | 73 ------ aws/import_aws_ebs_volume_test.go | 27 --- aws/import_aws_efs_file_system_test.go | 31 --- aws/import_aws_efs_mount_target_test.go | 31 --- ..._aws_elastic_beanstalk_application_test.go | 38 ---- ..._aws_elastic_beanstalk_environment_test.go | 46 ---- ...rt_aws_elasticache_parameter_group_test.go | 31 --- ..._aws_elasticache_replication_group_test.go | 37 --- ...mport_aws_elasticache_subnet_group_test.go | 34 --- aws/import_aws_elb_test.go | 28 --- ...ort_aws_emr_security_configuration_test.go | 28 --- aws/import_aws_flow_log_test.go | 31 --- aws/import_aws_glacier_vault_test.go | 30 --- aws/import_aws_glue_catalog_database_test.go | 29 --- aws/import_aws_glue_catalog_table_test.go | 29 --- aws/import_aws_iam_account_alias_test.go | 31 --- ...rt_aws_iam_account_password_policy_test.go | 28 --- aws/import_aws_iam_group_test.go | 33 --- aws/import_aws_iam_role_policy_test.go | 55 ----- aws/import_aws_iam_role_test.go | 30 --- aws/import_aws_iam_saml_provider_test.go | 28 --- aws/import_aws_iam_server_certificate_test.go | 34 --- aws/import_aws_iam_user_policy_test.go | 54 ----- aws/import_aws_iam_user_test.go | 34 --- aws/import_aws_instance_test.go | 212 ------------------ aws/import_aws_internet_gateway_test.go | 28 --- aws/import_aws_iot_thing_type_test.go | 29 --- aws/import_aws_iot_topic_rule_test.go | 29 --- ...s_kinesis_firehose_delivery_stream_test.go | 52 ----- aws/import_aws_kms_alias_test.go | 32 --- aws/import_aws_kms_key_test.go | 31 --- aws/import_aws_lambda_function_test.go | 148 ------------ aws/import_aws_launch_configuration_test.go | 29 --- aws/import_aws_launch_template_test.go | 50 ----- aws/import_aws_nat_gateway_test.go | 28 --- aws/import_aws_network_acl_test.go | 37 --- aws/import_aws_network_interface_test.go | 28 --- aws/import_aws_opsworks_custom_layer_test.go | 31 --- aws/import_aws_opsworks_stack_test.go | 31 --- ...ort_aws_organizations_organization_test.go | 28 --- aws/import_aws_placement_group_test.go | 28 --- aws/import_aws_rds_cluster_instance_test.go | 29 --- ...rt_aws_rds_cluster_parameter_group_test.go | 32 --- aws/import_aws_rds_cluster_test.go | 32 --- aws/import_aws_redshift_cluster_test.go | 31 --- ...mport_aws_redshift_parameter_group_test.go | 30 --- ...import_aws_redshift_security_group_test.go | 35 --- aws/import_aws_redshift_subnet_group_test.go | 32 --- aws/import_aws_route53_delegation_set_test.go | 30 --- aws/import_aws_route53_health_check_test.go | 28 --- aws/import_aws_route53_record_test.go | 49 ---- aws/import_aws_route53_zone_test.go | 34 --- aws/import_aws_s3_bucket_notification_test.go | 72 ------ aws/import_aws_s3_bucket_test.go | 78 ------- aws/import_aws_security_group_test.go | 190 ---------------- aws/import_aws_ses_receipt_filter_test.go | 28 --- aws/import_aws_ses_receipt_rule_set_test.go | 28 --- aws/import_aws_sfn_activity_test.go | 30 --- aws/import_aws_simpledb_domain_test.go | 28 --- aws/import_aws_sns_topic_subscription_test.go | 30 --- aws/import_aws_sns_topic_test.go | 30 --- ...ort_aws_spot_datafeed_subscription_test.go | 30 --- aws/import_aws_sqs_queue_test.go | 82 ------- aws/import_aws_ssm_parameter_test.go | 32 --- aws/import_aws_subnet_test.go | 28 --- aws/import_aws_vpc_dhcp_options_test.go | 27 --- ...c_endpoint_connection_notification_test.go | 31 --- aws/import_aws_vpc_endpoint_service_test.go | 31 --- aws/import_aws_vpc_endpoint_test.go | 28 --- ...aws_vpc_peering_connection_options_test.go | 28 --- aws/import_aws_vpc_peering_connection_test.go | 30 --- aws/import_aws_vpc_test.go | 28 --- aws/import_aws_vpn_connection_test.go | 29 --- aws/import_aws_vpn_gateway_test.go | 28 --- aws/resource_aws_api_gateway_account_test.go | 21 ++ aws/resource_aws_api_gateway_api_key_test.go | 21 ++ ...esource_aws_api_gateway_usage_plan_test.go | 22 ++ aws/resource_aws_autoscaling_group_test.go | 24 ++ ...source_aws_cloudfront_distribution_test.go | 23 ++ ..._cloudfront_origin_access_identity_test.go | 21 ++ aws/resource_aws_cloudtrail_test.go | 23 ++ aws/resource_aws_cloudwatch_dashboard_test.go | 21 ++ ...resource_aws_cloudwatch_event_rule_test.go | 22 ++ ..._cloudwatch_log_destination_policy_test.go | 23 ++ ...rce_aws_cloudwatch_log_destination_test.go | 23 ++ aws/resource_aws_cloudwatch_log_group_test.go | 23 ++ ...source_aws_cloudwatch_metric_alarm_test.go | 22 ++ aws/resource_aws_codebuild_project_test.go | 21 ++ ...resource_aws_codecommit_repository_test.go | 21 ++ aws/resource_aws_codepipeline_test.go | 25 +++ ...resource_aws_cognito_identity_pool_test.go | 22 ++ aws/resource_aws_cognito_user_pool_test.go | 21 ++ aws/resource_aws_customer_gateway_test.go | 23 ++ aws/resource_aws_dax_cluster_test.go | 22 ++ ...resource_aws_db_event_subscription_test.go | 24 ++ aws/resource_aws_db_instance_test.go | 26 +++ aws/resource_aws_db_option_group_test.go | 22 ++ aws/resource_aws_db_parameter_group_test.go | 22 ++ aws/resource_aws_db_security_group_test.go | 26 +++ aws/resource_aws_db_subnet_group_test.go | 24 ++ aws/resource_aws_dx_connection_test.go | 21 ++ aws/resource_aws_dx_gateway_test.go | 48 ++++ aws/resource_aws_dx_lag_test.go | 22 ++ aws/resource_aws_dynamodb_table_test.go | 65 ++++++ aws/resource_aws_ebs_volume_test.go | 20 ++ aws/resource_aws_efs_file_system_test.go | 23 ++ aws/resource_aws_efs_mount_target_test.go | 22 ++ ..._aws_elastic_beanstalk_application_test.go | 29 +++ ..._aws_elastic_beanstalk_environment_test.go | 37 +++ ...ce_aws_elasticache_parameter_group_test.go | 22 ++ ..._aws_elasticache_replication_group_test.go | 29 +++ ...ource_aws_elasticache_subnet_group_test.go | 24 ++ aws/resource_aws_elb_test.go | 21 ++ ...rce_aws_emr_security_configuration_test.go | 21 ++ aws/resource_aws_flow_log_test.go | 23 ++ aws/resource_aws_glacier_vault_test.go | 22 ++ ...resource_aws_glue_catalog_database_test.go | 21 ++ aws/resource_aws_glue_catalog_table_test.go | 21 ++ aws/resource_aws_iam_account_alias_test.go | 23 ++ ...ce_aws_iam_account_password_policy_test.go | 21 ++ aws/resource_aws_iam_group_test.go | 24 ++ aws/resource_aws_iam_role_policy_test.go | 47 ++++ aws/resource_aws_iam_role_test.go | 22 ++ aws/resource_aws_iam_saml_provider_test.go | 21 ++ ...esource_aws_iam_server_certificate_test.go | 25 +++ aws/resource_aws_iam_user_policy_test.go | 46 ++++ aws/resource_aws_iam_user_test.go | 25 +++ aws/resource_aws_instance_test.go | 203 +++++++++++++++++ aws/resource_aws_internet_gateway_test.go | 21 ++ aws/resource_aws_iot_thing_type_test.go | 21 ++ aws/resource_aws_iot_topic_rule_test.go | 21 ++ ...s_kinesis_firehose_delivery_stream_test.go | 42 ++++ aws/resource_aws_kms_alias_test.go | 23 ++ aws/resource_aws_kms_key_test.go | 23 ++ aws/resource_aws_lambda_function_test.go | 137 +++++++++++ aws/resource_aws_launch_configuration_test.go | 22 ++ aws/resource_aws_launch_template_test.go | 42 ++++ aws/resource_aws_nat_gateway_test.go | 21 ++ aws/resource_aws_network_acl_test.go | 19 ++ aws/resource_aws_network_interface_test.go | 21 ++ ...resource_aws_opsworks_custom_layer_test.go | 23 ++ aws/resource_aws_opsworks_stack_test.go | 23 ++ ...rce_aws_organizations_organization_test.go | 21 ++ aws/resource_aws_placement_group_test.go | 21 ++ aws/resource_aws_rds_cluster_instance_test.go | 21 ++ ...ce_aws_rds_cluster_parameter_group_test.go | 23 ++ aws/resource_aws_rds_cluster_test.go | 24 ++ aws/resource_aws_redshift_cluster_test.go | 23 ++ ...ource_aws_redshift_parameter_group_test.go | 22 ++ ...source_aws_redshift_security_group_test.go | 27 +++ ...resource_aws_redshift_subnet_group_test.go | 24 ++ ...esource_aws_route53_delegation_set_test.go | 22 ++ aws/resource_aws_route53_health_check_test.go | 21 ++ aws/resource_aws_route53_record_test.go | 42 ++++ aws/resource_aws_route53_zone_test.go | 25 +++ ...esource_aws_s3_bucket_notification_test.go | 63 ++++++ aws/resource_aws_s3_bucket_test.go | 68 ++++++ aws/resource_aws_security_group_test.go | 181 +++++++++++++++ aws/resource_aws_ses_receipt_filter_test.go | 21 ++ aws/resource_aws_ses_receipt_rule_set_test.go | 21 ++ aws/resource_aws_sfn_activity_test.go | 22 ++ aws/resource_aws_simpledb_domain_test.go | 21 ++ ...esource_aws_sns_topic_subscription_test.go | 22 ++ aws/resource_aws_sns_topic_test.go | 22 ++ ...rce_aws_spot_datafeed_subscription_test.go | 22 ++ aws/resource_aws_sqs_queue_test.go | 72 ++++++ aws/resource_aws_ssm_parameter_test.go | 24 ++ aws/resource_aws_subnet_test.go | 21 ++ aws/resource_aws_vpc_dhcp_options_test.go | 20 ++ ...c_endpoint_connection_notification_test.go | 22 ++ aws/resource_aws_vpc_endpoint_service_test.go | 22 ++ aws/resource_aws_vpc_endpoint_test.go | 21 ++ ...aws_vpc_peering_connection_options_test.go | 21 ++ ...esource_aws_vpc_peering_connection_test.go | 23 ++ aws/resource_aws_vpc_test.go | 21 ++ aws/resource_aws_vpn_connection_test.go | 21 ++ aws/resource_aws_vpn_gateway_test.go | 21 ++ 206 files changed, 3083 insertions(+), 3926 deletions(-) delete mode 100644 aws/import_aws_api_gateway_account_test.go delete mode 100644 aws/import_aws_api_gateway_key_test.go delete mode 100644 aws/import_aws_api_gateway_usage_plan_test.go delete mode 100644 aws/import_aws_autoscaling_group_test.go delete mode 100644 aws/import_aws_cloudfront_distribution_test.go delete mode 100644 aws/import_aws_cloudfront_origin_access_identity_test.go delete mode 100644 aws/import_aws_cloudtrail_test.go delete mode 100644 aws/import_aws_cloudwatch_dashboard_test.go delete mode 100644 aws/import_aws_cloudwatch_event_rule_test.go delete mode 100644 aws/import_aws_cloudwatch_log_destination_policy_test.go delete mode 100644 aws/import_aws_cloudwatch_log_destination_test.go delete mode 100644 aws/import_aws_cloudwatch_log_group_test.go delete mode 100644 aws/import_aws_cloudwatch_metric_alarm_test.go delete mode 100644 aws/import_aws_codebuild_project_test.go delete mode 100644 aws/import_aws_codecommit_repository_test.go delete mode 100644 aws/import_aws_codepipeline_test.go delete mode 100644 aws/import_aws_cognito_identity_pool_test.go delete mode 100644 aws/import_aws_cognito_user_pool_test.go delete mode 100644 aws/import_aws_customer_gateway_test.go delete mode 100644 aws/import_aws_dax_cluster_test.go delete mode 100644 aws/import_aws_db_event_subscription_test.go delete mode 100644 aws/import_aws_db_instance_test.go delete mode 100644 aws/import_aws_db_option_group_test.go delete mode 100644 aws/import_aws_db_parameter_group_group_test.go delete mode 100644 aws/import_aws_db_security_group_test.go delete mode 100644 aws/import_aws_db_subnet_group_test.go delete mode 100644 aws/import_aws_dx_connection_test.go delete mode 100644 aws/import_aws_dx_gateway_test.go delete mode 100644 aws/import_aws_dx_lag_test.go delete mode 100644 aws/import_aws_dynamodb_table_test.go delete mode 100644 aws/import_aws_ebs_volume_test.go delete mode 100644 aws/import_aws_efs_file_system_test.go delete mode 100644 aws/import_aws_efs_mount_target_test.go delete mode 100644 aws/import_aws_elastic_beanstalk_application_test.go delete mode 100644 aws/import_aws_elastic_beanstalk_environment_test.go delete mode 100644 aws/import_aws_elasticache_parameter_group_test.go delete mode 100644 aws/import_aws_elasticache_replication_group_test.go delete mode 100644 aws/import_aws_elasticache_subnet_group_test.go delete mode 100644 aws/import_aws_elb_test.go delete mode 100644 aws/import_aws_emr_security_configuration_test.go delete mode 100644 aws/import_aws_flow_log_test.go delete mode 100644 aws/import_aws_glacier_vault_test.go delete mode 100644 aws/import_aws_glue_catalog_database_test.go delete mode 100644 aws/import_aws_glue_catalog_table_test.go delete mode 100644 aws/import_aws_iam_account_alias_test.go delete mode 100644 aws/import_aws_iam_account_password_policy_test.go delete mode 100644 aws/import_aws_iam_group_test.go delete mode 100644 aws/import_aws_iam_role_policy_test.go delete mode 100644 aws/import_aws_iam_role_test.go delete mode 100644 aws/import_aws_iam_saml_provider_test.go delete mode 100644 aws/import_aws_iam_server_certificate_test.go delete mode 100644 aws/import_aws_iam_user_policy_test.go delete mode 100644 aws/import_aws_iam_user_test.go delete mode 100644 aws/import_aws_instance_test.go delete mode 100644 aws/import_aws_internet_gateway_test.go delete mode 100644 aws/import_aws_iot_thing_type_test.go delete mode 100644 aws/import_aws_iot_topic_rule_test.go delete mode 100644 aws/import_aws_kinesis_firehose_delivery_stream_test.go delete mode 100644 aws/import_aws_kms_alias_test.go delete mode 100644 aws/import_aws_kms_key_test.go delete mode 100644 aws/import_aws_lambda_function_test.go delete mode 100644 aws/import_aws_launch_configuration_test.go delete mode 100644 aws/import_aws_launch_template_test.go delete mode 100644 aws/import_aws_nat_gateway_test.go delete mode 100644 aws/import_aws_network_acl_test.go delete mode 100644 aws/import_aws_network_interface_test.go delete mode 100644 aws/import_aws_opsworks_custom_layer_test.go delete mode 100644 aws/import_aws_opsworks_stack_test.go delete mode 100644 aws/import_aws_organizations_organization_test.go delete mode 100644 aws/import_aws_placement_group_test.go delete mode 100644 aws/import_aws_rds_cluster_instance_test.go delete mode 100644 aws/import_aws_rds_cluster_parameter_group_test.go delete mode 100644 aws/import_aws_rds_cluster_test.go delete mode 100644 aws/import_aws_redshift_cluster_test.go delete mode 100644 aws/import_aws_redshift_parameter_group_test.go delete mode 100644 aws/import_aws_redshift_security_group_test.go delete mode 100644 aws/import_aws_redshift_subnet_group_test.go delete mode 100644 aws/import_aws_route53_delegation_set_test.go delete mode 100644 aws/import_aws_route53_health_check_test.go delete mode 100644 aws/import_aws_route53_record_test.go delete mode 100644 aws/import_aws_route53_zone_test.go delete mode 100644 aws/import_aws_s3_bucket_notification_test.go delete mode 100644 aws/import_aws_s3_bucket_test.go delete mode 100644 aws/import_aws_security_group_test.go delete mode 100644 aws/import_aws_ses_receipt_filter_test.go delete mode 100644 aws/import_aws_ses_receipt_rule_set_test.go delete mode 100644 aws/import_aws_sfn_activity_test.go delete mode 100644 aws/import_aws_simpledb_domain_test.go delete mode 100644 aws/import_aws_sns_topic_subscription_test.go delete mode 100644 aws/import_aws_sns_topic_test.go delete mode 100644 aws/import_aws_spot_datafeed_subscription_test.go delete mode 100644 aws/import_aws_sqs_queue_test.go delete mode 100644 aws/import_aws_ssm_parameter_test.go delete mode 100644 aws/import_aws_subnet_test.go delete mode 100644 aws/import_aws_vpc_dhcp_options_test.go delete mode 100644 aws/import_aws_vpc_endpoint_connection_notification_test.go delete mode 100644 aws/import_aws_vpc_endpoint_service_test.go delete mode 100644 aws/import_aws_vpc_endpoint_test.go delete mode 100644 aws/import_aws_vpc_peering_connection_options_test.go delete mode 100644 aws/import_aws_vpc_peering_connection_test.go delete mode 100644 aws/import_aws_vpc_test.go delete mode 100644 aws/import_aws_vpn_connection_test.go delete mode 100644 aws/import_aws_vpn_gateway_test.go diff --git a/aws/import_aws_api_gateway_account_test.go b/aws/import_aws_api_gateway_account_test.go deleted file mode 100644 index 78587d660b3..00000000000 --- a/aws/import_aws_api_gateway_account_test.go +++ /dev/null @@ -1,28 +0,0 @@ -package aws - -import ( - "testing" - - "github.com/hashicorp/terraform/helper/resource" -) - -func TestAccAWSAPIGatewayAccount_importBasic(t *testing.T) { - resourceName := "aws_api_gateway_account.test" - - resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSAPIGatewayAccountDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAWSAPIGatewayAccountConfig_empty, - }, - - { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - }, - }, - }) -} diff --git a/aws/import_aws_api_gateway_key_test.go b/aws/import_aws_api_gateway_key_test.go deleted file mode 100644 index 08a66b01934..00000000000 --- a/aws/import_aws_api_gateway_key_test.go +++ /dev/null @@ -1,28 +0,0 @@ -package aws - -import ( - "testing" - - "github.com/hashicorp/terraform/helper/resource" -) - -func TestAccAWSAPIGatewayApiKey_importBasic(t *testing.T) { - resourceName := "aws_api_gateway_api_key.test" - - resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSAPIGatewayApiKeyDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAWSAPIGatewayApiKeyConfig, - }, - - { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - }, - }, - }) -} diff --git a/aws/import_aws_api_gateway_usage_plan_test.go b/aws/import_aws_api_gateway_usage_plan_test.go deleted file mode 100644 index 76a58e0c5d5..00000000000 --- a/aws/import_aws_api_gateway_usage_plan_test.go +++ /dev/null @@ -1,30 +0,0 @@ -package aws - -import ( - "testing" - - "github.com/hashicorp/terraform/helper/acctest" - "github.com/hashicorp/terraform/helper/resource" -) - -func TestAccAWSAPIGatewayUsagePlan_importBasic(t *testing.T) { - resourceName := "aws_api_gateway_usage_plan.main" - rName := acctest.RandString(10) - - resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSAPIGatewayUsagePlanDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAWSApiGatewayUsagePlanBasicConfig(rName), - }, - - { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - }, - }, - }) -} diff --git a/aws/import_aws_autoscaling_group_test.go b/aws/import_aws_autoscaling_group_test.go deleted file mode 100644 index 579a71c79ff..00000000000 --- a/aws/import_aws_autoscaling_group_test.go +++ /dev/null @@ -1,33 +0,0 @@ -package aws - -import ( - "fmt" - "testing" - - "github.com/hashicorp/terraform/helper/acctest" - "github.com/hashicorp/terraform/helper/resource" -) - -func TestAccAWSAutoScalingGroup_importBasic(t *testing.T) { - resourceName := "aws_autoscaling_group.bar" - randName := fmt.Sprintf("terraform-test-%s", acctest.RandString(10)) - - resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSAutoScalingGroupDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAWSAutoScalingGroupImport(randName), - }, - - { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{ - "force_delete", "metrics_granularity", "wait_for_capacity_timeout"}, - }, - }, - }) -} diff --git a/aws/import_aws_cloudfront_distribution_test.go b/aws/import_aws_cloudfront_distribution_test.go deleted file mode 100644 index 787d913a591..00000000000 --- a/aws/import_aws_cloudfront_distribution_test.go +++ /dev/null @@ -1,32 +0,0 @@ -package aws - -import ( - "fmt" - "testing" - - "github.com/hashicorp/terraform/helper/acctest" - "github.com/hashicorp/terraform/helper/resource" -) - -func TestAccAWSCloudFrontDistribution_importBasic(t *testing.T) { - ri := acctest.RandInt() - testConfig := fmt.Sprintf(testAccAWSCloudFrontDistributionS3Config, ri, originBucket, logBucket, testAccAWSCloudFrontDistributionRetainConfig()) - - resourceName := "aws_cloudfront_distribution.s3_distribution" - - resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckCloudFrontDistributionDestroy, - Steps: []resource.TestStep{ - { - Config: testConfig, - }, - { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - }, - }, - }) -} diff --git a/aws/import_aws_cloudfront_origin_access_identity_test.go b/aws/import_aws_cloudfront_origin_access_identity_test.go deleted file mode 100644 index 86eca0bcec8..00000000000 --- a/aws/import_aws_cloudfront_origin_access_identity_test.go +++ /dev/null @@ -1,28 +0,0 @@ -package aws - -import ( - "testing" - - "github.com/hashicorp/terraform/helper/resource" -) - -func TestAccAWSCloudFrontOriginAccessIdentity_importBasic(t *testing.T) { - resourceName := "aws_cloudfront_origin_access_identity.origin_access_identity" - - resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckCloudFrontOriginAccessIdentityDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAWSCloudFrontOriginAccessIdentityConfig, - }, - - { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - }, - }, - }) -} diff --git a/aws/import_aws_cloudtrail_test.go b/aws/import_aws_cloudtrail_test.go deleted file mode 100644 index bf2a2c44dc0..00000000000 --- a/aws/import_aws_cloudtrail_test.go +++ /dev/null @@ -1,31 +0,0 @@ -package aws - -import ( - "testing" - - "github.com/hashicorp/terraform/helper/acctest" - "github.com/hashicorp/terraform/helper/resource" -) - -func TestAccAWSCloudTrail_importBasic(t *testing.T) { - resourceName := "aws_cloudtrail.foobar" - cloudTrailRandInt := acctest.RandInt() - - resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSCloudTrailDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAWSCloudTrailConfig(cloudTrailRandInt), - }, - - { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"enable_log_file_validation", "is_multi_region_trail", "include_global_service_events", "enable_logging"}, - }, - }, - }) -} diff --git a/aws/import_aws_cloudwatch_dashboard_test.go b/aws/import_aws_cloudwatch_dashboard_test.go deleted file mode 100644 index fda495d9dbd..00000000000 --- a/aws/import_aws_cloudwatch_dashboard_test.go +++ /dev/null @@ -1,29 +0,0 @@ -package aws - -import ( - "testing" - - "github.com/hashicorp/terraform/helper/acctest" - "github.com/hashicorp/terraform/helper/resource" -) - -func TestAccAWSCloudWatchDashboard_importBasic(t *testing.T) { - resourceName := "aws_cloudwatch_dashboard.foobar" - rInt := acctest.RandInt() - - resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSCloudWatchDashboardDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAWSCloudWatchDashboardConfig(rInt), - }, - { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - }, - }, - }) -} diff --git a/aws/import_aws_cloudwatch_event_rule_test.go b/aws/import_aws_cloudwatch_event_rule_test.go deleted file mode 100644 index a63f707c51d..00000000000 --- a/aws/import_aws_cloudwatch_event_rule_test.go +++ /dev/null @@ -1,29 +0,0 @@ -package aws - -import ( - "testing" - - "github.com/hashicorp/terraform/helper/resource" -) - -func TestAccAWSCloudWatchEventRule_importBasic(t *testing.T) { - resourceName := "aws_cloudwatch_event_rule.foo" - - resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSCloudWatchEventRuleDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAWSCloudWatchEventRuleConfig, - }, - - { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"is_enabled"}, //this has a default value - }, - }, - }) -} diff --git a/aws/import_aws_cloudwatch_log_destination_policy_test.go b/aws/import_aws_cloudwatch_log_destination_policy_test.go deleted file mode 100644 index 2696f2b7c6d..00000000000 --- a/aws/import_aws_cloudwatch_log_destination_policy_test.go +++ /dev/null @@ -1,31 +0,0 @@ -package aws - -import ( - "testing" - - "github.com/hashicorp/terraform/helper/acctest" - "github.com/hashicorp/terraform/helper/resource" -) - -func TestAccAWSCloudwatchLogDestinationPolicy_importBasic(t *testing.T) { - resourceName := "aws_cloudwatch_log_destination_policy.test" - - rstring := acctest.RandString(5) - - resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSCloudwatchLogDestinationPolicyDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAWSCloudwatchLogDestinationPolicyConfig(rstring), - }, - - { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - }, - }, - }) -} diff --git a/aws/import_aws_cloudwatch_log_destination_test.go b/aws/import_aws_cloudwatch_log_destination_test.go deleted file mode 100644 index f32091810df..00000000000 --- a/aws/import_aws_cloudwatch_log_destination_test.go +++ /dev/null @@ -1,31 +0,0 @@ -package aws - -import ( - "testing" - - "github.com/hashicorp/terraform/helper/acctest" - "github.com/hashicorp/terraform/helper/resource" -) - -func TestAccAWSCloudwatchLogDestination_importBasic(t *testing.T) { - resourceName := "aws_cloudwatch_log_destination.test" - - rstring := acctest.RandString(5) - - resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSCloudwatchLogDestinationDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAWSCloudwatchLogDestinationConfig(rstring), - }, - - { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - }, - }, - }) -} diff --git a/aws/import_aws_cloudwatch_log_group_test.go b/aws/import_aws_cloudwatch_log_group_test.go deleted file mode 100644 index 384b2718365..00000000000 --- a/aws/import_aws_cloudwatch_log_group_test.go +++ /dev/null @@ -1,31 +0,0 @@ -package aws - -import ( - "testing" - - "github.com/hashicorp/terraform/helper/acctest" - "github.com/hashicorp/terraform/helper/resource" -) - -func TestAccAWSCloudWatchLogGroup_importBasic(t *testing.T) { - resourceName := "aws_cloudwatch_log_group.foobar" - rInt := acctest.RandInt() - - resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSCloudWatchLogGroupDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAWSCloudWatchLogGroupConfig(rInt), - }, - - { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"retention_in_days"}, //this has a default value - }, - }, - }) -} diff --git a/aws/import_aws_cloudwatch_metric_alarm_test.go b/aws/import_aws_cloudwatch_metric_alarm_test.go deleted file mode 100644 index 1cb30254c14..00000000000 --- a/aws/import_aws_cloudwatch_metric_alarm_test.go +++ /dev/null @@ -1,30 +0,0 @@ -package aws - -import ( - "testing" - - "github.com/hashicorp/terraform/helper/acctest" - "github.com/hashicorp/terraform/helper/resource" -) - -func TestAccAWSCloudWatchMetricAlarm_importBasic(t *testing.T) { - rInt := acctest.RandInt() - resourceName := "aws_cloudwatch_metric_alarm.foobar" - - resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSCloudWatchMetricAlarmDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAWSCloudWatchMetricAlarmConfig(rInt), - }, - - { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - }, - }, - }) -} diff --git a/aws/import_aws_codebuild_project_test.go b/aws/import_aws_codebuild_project_test.go deleted file mode 100644 index 9968e298af2..00000000000 --- a/aws/import_aws_codebuild_project_test.go +++ /dev/null @@ -1,29 +0,0 @@ -package aws - -import ( - "testing" - - "github.com/hashicorp/terraform/helper/acctest" - "github.com/hashicorp/terraform/helper/resource" -) - -func TestAccAWSCodeBuildProject_importBasic(t *testing.T) { - resourceName := "aws_codebuild_project.test" - rName := acctest.RandomWithPrefix("tf-acc-test") - - resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSCodeBuildProjectDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAWSCodeBuildProjectConfig_basic(rName), - }, - { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - }, - }, - }) -} diff --git a/aws/import_aws_codecommit_repository_test.go b/aws/import_aws_codecommit_repository_test.go deleted file mode 100644 index ea203c9c14a..00000000000 --- a/aws/import_aws_codecommit_repository_test.go +++ /dev/null @@ -1,29 +0,0 @@ -package aws - -import ( - "testing" - - "github.com/hashicorp/terraform/helper/acctest" - "github.com/hashicorp/terraform/helper/resource" -) - -func TestAccAWSCodeCommitRepository_importBasic(t *testing.T) { - resName := "aws_codecommit_repository.test" - rInt := acctest.RandInt() - - resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckCodeCommitRepositoryDestroy, - Steps: []resource.TestStep{ - { - Config: testAccCodeCommitRepository_basic(rInt), - }, - { - ResourceName: resName, - ImportState: true, - ImportStateVerify: true, - }, - }, - }) -} diff --git a/aws/import_aws_codepipeline_test.go b/aws/import_aws_codepipeline_test.go deleted file mode 100644 index 69d2467ea22..00000000000 --- a/aws/import_aws_codepipeline_test.go +++ /dev/null @@ -1,34 +0,0 @@ -package aws - -import ( - "os" - "testing" - - "github.com/hashicorp/terraform/helper/acctest" - "github.com/hashicorp/terraform/helper/resource" -) - -func TestAccAWSCodePipeline_Import_basic(t *testing.T) { - if os.Getenv("GITHUB_TOKEN") == "" { - t.Skip("Environment variable GITHUB_TOKEN is not set") - } - - name := acctest.RandString(10) - - resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSCodePipelineDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAWSCodePipelineConfig_basic(name), - }, - - { - ResourceName: "aws_codepipeline.bar", - ImportState: true, - ImportStateVerify: true, - }, - }, - }) -} diff --git a/aws/import_aws_cognito_identity_pool_test.go b/aws/import_aws_cognito_identity_pool_test.go deleted file mode 100644 index bdd2caec809..00000000000 --- a/aws/import_aws_cognito_identity_pool_test.go +++ /dev/null @@ -1,30 +0,0 @@ -package aws - -import ( - "testing" - - "github.com/hashicorp/terraform/helper/acctest" - "github.com/hashicorp/terraform/helper/resource" -) - -func TestAccAWSCognitoIdentityPool_importBasic(t *testing.T) { - resourceName := "aws_cognito_identity_pool.main" - rName := acctest.RandString(10) - - resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSAPIGatewayAccountDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAWSCognitoIdentityPoolConfig_basic(rName), - }, - - { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - }, - }, - }) -} diff --git a/aws/import_aws_cognito_user_pool_test.go b/aws/import_aws_cognito_user_pool_test.go deleted file mode 100644 index 24056018171..00000000000 --- a/aws/import_aws_cognito_user_pool_test.go +++ /dev/null @@ -1,29 +0,0 @@ -package aws - -import ( - "testing" - - "github.com/hashicorp/terraform/helper/acctest" - "github.com/hashicorp/terraform/helper/resource" -) - -func TestAccAWSCognitoUserPool_importBasic(t *testing.T) { - resourceName := "aws_cognito_user_pool.pool" - name := acctest.RandString(5) - - resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSCloudWatchDashboardDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAWSCognitoUserPoolConfig_basic(name), - }, - { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - }, - }, - }) -} diff --git a/aws/import_aws_customer_gateway_test.go b/aws/import_aws_customer_gateway_test.go deleted file mode 100644 index 6c4e1f67c17..00000000000 --- a/aws/import_aws_customer_gateway_test.go +++ /dev/null @@ -1,31 +0,0 @@ -package aws - -import ( - "testing" - - "github.com/hashicorp/terraform/helper/acctest" - "github.com/hashicorp/terraform/helper/resource" -) - -func TestAccAWSCustomerGateway_importBasic(t *testing.T) { - resourceName := "aws_customer_gateway.foo" - rInt := acctest.RandInt() - rBgpAsn := acctest.RandIntRange(64512, 65534) - - resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckCustomerGatewayDestroy, - Steps: []resource.TestStep{ - { - Config: testAccCustomerGatewayConfig(rInt, rBgpAsn), - }, - - { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - }, - }, - }) -} diff --git a/aws/import_aws_dax_cluster_test.go b/aws/import_aws_dax_cluster_test.go deleted file mode 100644 index e7ff6d397dc..00000000000 --- a/aws/import_aws_dax_cluster_test.go +++ /dev/null @@ -1,30 +0,0 @@ -package aws - -import ( - "testing" - - "github.com/hashicorp/terraform/helper/acctest" - "github.com/hashicorp/terraform/helper/resource" -) - -func TestAccAWSDAXCluster_importBasic(t *testing.T) { - resourceName := "aws_dax_cluster.test" - rString := acctest.RandString(10) - - resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSDAXClusterDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAWSDAXClusterConfig(rString), - }, - - { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - }, - }, - }) -} diff --git a/aws/import_aws_db_event_subscription_test.go b/aws/import_aws_db_event_subscription_test.go deleted file mode 100644 index 2aa85073f67..00000000000 --- a/aws/import_aws_db_event_subscription_test.go +++ /dev/null @@ -1,33 +0,0 @@ -package aws - -import ( - "fmt" - "testing" - - "github.com/hashicorp/terraform/helper/acctest" - "github.com/hashicorp/terraform/helper/resource" -) - -func TestAccAWSDBEventSubscription_importBasic(t *testing.T) { - resourceName := "aws_db_event_subscription.bar" - rInt := acctest.RandInt() - subscriptionName := fmt.Sprintf("tf-acc-test-rds-event-subs-%d", rInt) - - resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSDBEventSubscriptionDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAWSDBEventSubscriptionConfig(rInt), - }, - - { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - ImportStateId: subscriptionName, - }, - }, - }) -} diff --git a/aws/import_aws_db_instance_test.go b/aws/import_aws_db_instance_test.go deleted file mode 100644 index 5fea3c2e0d0..00000000000 --- a/aws/import_aws_db_instance_test.go +++ /dev/null @@ -1,33 +0,0 @@ -package aws - -import ( - "testing" - - "github.com/hashicorp/terraform/helper/resource" -) - -func TestAccAWSDBInstance_importBasic(t *testing.T) { - resourceName := "aws_db_instance.bar" - - resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSDBInstanceDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAWSDBInstanceConfig, - }, - - { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{ - "password", - "skip_final_snapshot", - "final_snapshot_identifier", - }, - }, - }, - }) -} diff --git a/aws/import_aws_db_option_group_test.go b/aws/import_aws_db_option_group_test.go deleted file mode 100644 index c87b251948d..00000000000 --- a/aws/import_aws_db_option_group_test.go +++ /dev/null @@ -1,31 +0,0 @@ -package aws - -import ( - "fmt" - "testing" - - "github.com/hashicorp/terraform/helper/acctest" - "github.com/hashicorp/terraform/helper/resource" -) - -func TestAccAWSDBOptionGroup_importBasic(t *testing.T) { - resourceName := "aws_db_option_group.bar" - rName := fmt.Sprintf("option-group-test-terraform-%s", acctest.RandString(5)) - - resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSDBOptionGroupDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAWSDBOptionGroupBasicConfig(rName), - }, - - { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - }, - }, - }) -} diff --git a/aws/import_aws_db_parameter_group_group_test.go b/aws/import_aws_db_parameter_group_group_test.go deleted file mode 100644 index 52d98fc5faa..00000000000 --- a/aws/import_aws_db_parameter_group_group_test.go +++ /dev/null @@ -1,31 +0,0 @@ -package aws - -import ( - "fmt" - "testing" - - "github.com/hashicorp/terraform/helper/acctest" - "github.com/hashicorp/terraform/helper/resource" -) - -func TestAccAWSDBParameterGroup_importBasic(t *testing.T) { - resourceName := "aws_db_parameter_group.bar" - groupName := fmt.Sprintf("parameter-group-test-terraform-%d", acctest.RandInt()) - - resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSDBParameterGroupDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAWSDBParameterGroupConfig(groupName), - }, - - { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - }, - }, - }) -} diff --git a/aws/import_aws_db_security_group_test.go b/aws/import_aws_db_security_group_test.go deleted file mode 100644 index 3819e2d16c7..00000000000 --- a/aws/import_aws_db_security_group_test.go +++ /dev/null @@ -1,36 +0,0 @@ -package aws - -import ( - "fmt" - "os" - "testing" - - "github.com/hashicorp/terraform/helper/acctest" - "github.com/hashicorp/terraform/helper/resource" -) - -func TestAccAWSDBSecurityGroup_importBasic(t *testing.T) { - oldvar := os.Getenv("AWS_DEFAULT_REGION") - os.Setenv("AWS_DEFAULT_REGION", "us-east-1") - defer os.Setenv("AWS_DEFAULT_REGION", oldvar) - - rName := fmt.Sprintf("tf-acc-%s", acctest.RandString(5)) - resourceName := "aws_db_security_group.bar" - - resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSDBSecurityGroupDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAWSDBSecurityGroupConfig(rName), - }, - - { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - }, - }, - }) -} diff --git a/aws/import_aws_db_subnet_group_test.go b/aws/import_aws_db_subnet_group_test.go deleted file mode 100644 index f91dc80f9a5..00000000000 --- a/aws/import_aws_db_subnet_group_test.go +++ /dev/null @@ -1,33 +0,0 @@ -package aws - -import ( - "fmt" - "testing" - - "github.com/hashicorp/terraform/helper/acctest" - "github.com/hashicorp/terraform/helper/resource" -) - -func TestAccAWSDBSubnetGroup_importBasic(t *testing.T) { - resourceName := "aws_db_subnet_group.foo" - - rName := fmt.Sprintf("tf-test-%d", acctest.RandInt()) - resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckDBSubnetGroupDestroy, - Steps: []resource.TestStep{ - { - Config: testAccDBSubnetGroupConfig(rName), - }, - - { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{ - "description"}, - }, - }, - }) -} diff --git a/aws/import_aws_dx_connection_test.go b/aws/import_aws_dx_connection_test.go deleted file mode 100644 index be539d9eeac..00000000000 --- a/aws/import_aws_dx_connection_test.go +++ /dev/null @@ -1,29 +0,0 @@ -package aws - -import ( - "testing" - - "github.com/hashicorp/terraform/helper/acctest" - "github.com/hashicorp/terraform/helper/resource" -) - -func TestAccAWSDxConnection_importBasic(t *testing.T) { - resourceName := "aws_dx_connection.hoge" - - resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAwsDxConnectionDestroy, - Steps: []resource.TestStep{ - { - Config: testAccDxConnectionConfig(acctest.RandString(5)), - }, - - { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - }, - }, - }) -} diff --git a/aws/import_aws_dx_gateway_test.go b/aws/import_aws_dx_gateway_test.go deleted file mode 100644 index 6923cbfc817..00000000000 --- a/aws/import_aws_dx_gateway_test.go +++ /dev/null @@ -1,58 +0,0 @@ -package aws - -import ( - "fmt" - "testing" - - "github.com/hashicorp/terraform/helper/acctest" - "github.com/hashicorp/terraform/helper/resource" - "github.com/hashicorp/terraform/terraform" -) - -func TestAccAwsDxGateway_importBasic(t *testing.T) { - resourceName := "aws_dx_gateway.test" - - resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAwsDxGatewayDestroy, - Steps: []resource.TestStep{ - { - Config: testAccDxGatewayConfig(acctest.RandString(5), randIntRange(64512, 65534)), - }, - - { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - }, - }, - }) -} - -func TestAccAwsDxGateway_importComplex(t *testing.T) { - checkFn := func(s []*terraform.InstanceState) error { - if len(s) != 3 { - return fmt.Errorf("Got %d resources, expected 3. State: %#v", len(s), s) - } - return nil - } - - resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAwsDxGatewayDestroy, - Steps: []resource.TestStep{ - { - Config: testAccDxGatewayAssociationConfig_multiVgws(acctest.RandString(5), randIntRange(64512, 65534)), - }, - - { - ResourceName: "aws_dx_gateway.test", - ImportState: true, - ImportStateCheck: checkFn, - ImportStateVerify: true, - }, - }, - }) -} diff --git a/aws/import_aws_dx_lag_test.go b/aws/import_aws_dx_lag_test.go deleted file mode 100644 index f5cbe095751..00000000000 --- a/aws/import_aws_dx_lag_test.go +++ /dev/null @@ -1,30 +0,0 @@ -package aws - -import ( - "testing" - - "github.com/hashicorp/terraform/helper/acctest" - "github.com/hashicorp/terraform/helper/resource" -) - -func TestAccAWSDxLag_importBasic(t *testing.T) { - resourceName := "aws_dx_lag.hoge" - - resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAwsDxLagDestroy, - Steps: []resource.TestStep{ - { - Config: testAccDxLagConfig(acctest.RandString(5)), - }, - - { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"force_destroy"}, - }, - }, - }) -} diff --git a/aws/import_aws_dynamodb_table_test.go b/aws/import_aws_dynamodb_table_test.go deleted file mode 100644 index 666573c71b2..00000000000 --- a/aws/import_aws_dynamodb_table_test.go +++ /dev/null @@ -1,73 +0,0 @@ -package aws - -import ( - "testing" - - "github.com/hashicorp/terraform/helper/acctest" - "github.com/hashicorp/terraform/helper/resource" -) - -func TestAccAWSDynamoDbTable_importBasic(t *testing.T) { - resourceName := "aws_dynamodb_table.basic-dynamodb-table" - - rName := acctest.RandomWithPrefix("TerraformTestTable-") - resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSDynamoDbTableDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAWSDynamoDbConfigInitialState(rName), - }, - - { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - }, - }, - }) -} - -func TestAccAWSDynamoDbTable_importTags(t *testing.T) { - resourceName := "aws_dynamodb_table.basic-dynamodb-table" - - resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSDynamoDbTableDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAWSDynamoDbConfigTags(), - }, - - { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - }, - }, - }) -} - -func TestAccAWSDynamoDbTable_importTimeToLive(t *testing.T) { - resourceName := "aws_dynamodb_table.basic-dynamodb-table" - rName := acctest.RandomWithPrefix("TerraformTestTable-") - - resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSDynamoDbTableDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAWSDynamoDbConfigAddTimeToLive(rName), - }, - - { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - }, - }, - }) -} diff --git a/aws/import_aws_ebs_volume_test.go b/aws/import_aws_ebs_volume_test.go deleted file mode 100644 index 130166651db..00000000000 --- a/aws/import_aws_ebs_volume_test.go +++ /dev/null @@ -1,27 +0,0 @@ -package aws - -import ( - "testing" - - "github.com/hashicorp/terraform/helper/resource" -) - -func TestAccAWSEBSVolume_importBasic(t *testing.T) { - resourceName := "aws_ebs_volume.test" - - resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - Steps: []resource.TestStep{ - { - Config: testAccAwsEbsVolumeConfig, - }, - - { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - }, - }, - }) -} diff --git a/aws/import_aws_efs_file_system_test.go b/aws/import_aws_efs_file_system_test.go deleted file mode 100644 index eedd7107970..00000000000 --- a/aws/import_aws_efs_file_system_test.go +++ /dev/null @@ -1,31 +0,0 @@ -package aws - -import ( - "testing" - - "github.com/hashicorp/terraform/helper/acctest" - "github.com/hashicorp/terraform/helper/resource" -) - -func TestAccAWSEFSFileSystem_importBasic(t *testing.T) { - resourceName := "aws_efs_file_system.foo-with-tags" - rInt := acctest.RandInt() - - resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckEfsFileSystemDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAWSEFSFileSystemConfigWithTags(rInt), - }, - - { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"reference_name", "creation_token"}, - }, - }, - }) -} diff --git a/aws/import_aws_efs_mount_target_test.go b/aws/import_aws_efs_mount_target_test.go deleted file mode 100644 index c2815c32a6f..00000000000 --- a/aws/import_aws_efs_mount_target_test.go +++ /dev/null @@ -1,31 +0,0 @@ -package aws - -import ( - "fmt" - "testing" - - "github.com/hashicorp/terraform/helper/acctest" - "github.com/hashicorp/terraform/helper/resource" -) - -func TestAccAWSEFSMountTarget_importBasic(t *testing.T) { - resourceName := "aws_efs_mount_target.alpha" - - ct := fmt.Sprintf("createtoken-%d", acctest.RandInt()) - resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckEfsMountTargetDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAWSEFSMountTargetConfig(ct), - }, - - { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - }, - }, - }) -} diff --git a/aws/import_aws_elastic_beanstalk_application_test.go b/aws/import_aws_elastic_beanstalk_application_test.go deleted file mode 100644 index 8d322abb47f..00000000000 --- a/aws/import_aws_elastic_beanstalk_application_test.go +++ /dev/null @@ -1,38 +0,0 @@ -package aws - -import ( - "fmt" - "testing" - - "github.com/hashicorp/terraform/helper/acctest" - "github.com/hashicorp/terraform/helper/resource" -) - -func TestAWSElasticBeanstalkApplication_importBasic(t *testing.T) { - resourceName := "aws_elastic_beanstalk_application.tftest" - config := fmt.Sprintf("tf-test-name-%d", acctest.RandInt()) - - resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckBeanstalkAppDestroy, - Steps: []resource.TestStep{ - { - Config: testAccBeanstalkAppImportConfig(config), - }, - - { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - }, - }, - }) -} - -func testAccBeanstalkAppImportConfig(name string) string { - return fmt.Sprintf(`resource "aws_elastic_beanstalk_application" "tftest" { - name = "%s" - description = "tf-test-desc" - }`, name) -} diff --git a/aws/import_aws_elastic_beanstalk_environment_test.go b/aws/import_aws_elastic_beanstalk_environment_test.go deleted file mode 100644 index 559df2e3e33..00000000000 --- a/aws/import_aws_elastic_beanstalk_environment_test.go +++ /dev/null @@ -1,46 +0,0 @@ -package aws - -import ( - "fmt" - "testing" - - "github.com/hashicorp/terraform/helper/acctest" - "github.com/hashicorp/terraform/helper/resource" -) - -func TestAWSElasticBeanstalkEnvironment_importBasic(t *testing.T) { - resourceName := "aws_elastic_beanstalk_application.tftest" - - applicationName := fmt.Sprintf("tf-test-name-%d", acctest.RandInt()) - environmentName := fmt.Sprintf("tf-test-env-name-%d", acctest.RandInt()) - - resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckBeanstalkAppDestroy, - Steps: []resource.TestStep{ - { - Config: testAccBeanstalkEnvImportConfig(applicationName, environmentName), - }, - - { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - }, - }, - }) -} - -func testAccBeanstalkEnvImportConfig(appName, envName string) string { - return fmt.Sprintf(`resource "aws_elastic_beanstalk_application" "tftest" { - name = "%s" - description = "tf-test-desc" - } - - resource "aws_elastic_beanstalk_environment" "tfenvtest" { - name = "%s" - application = "${aws_elastic_beanstalk_application.tftest.name}" - solution_stack_name = "64bit Amazon Linux running Python" - }`, appName, envName) -} diff --git a/aws/import_aws_elasticache_parameter_group_test.go b/aws/import_aws_elasticache_parameter_group_test.go deleted file mode 100644 index ed2add0fd88..00000000000 --- a/aws/import_aws_elasticache_parameter_group_test.go +++ /dev/null @@ -1,31 +0,0 @@ -package aws - -import ( - "fmt" - "testing" - - "github.com/hashicorp/terraform/helper/acctest" - "github.com/hashicorp/terraform/helper/resource" -) - -func TestAccAWSElasticacheParameterGroup_importBasic(t *testing.T) { - resourceName := "aws_elasticache_parameter_group.bar" - rName := fmt.Sprintf("parameter-group-test-terraform-%d", acctest.RandInt()) - - resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSElasticacheParameterGroupDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAWSElasticacheParameterGroupConfig(rName), - }, - - { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - }, - }, - }) -} diff --git a/aws/import_aws_elasticache_replication_group_test.go b/aws/import_aws_elasticache_replication_group_test.go deleted file mode 100644 index b87598e72d7..00000000000 --- a/aws/import_aws_elasticache_replication_group_test.go +++ /dev/null @@ -1,37 +0,0 @@ -package aws - -import ( - "os" - "testing" - - "github.com/hashicorp/terraform/helper/acctest" - "github.com/hashicorp/terraform/helper/resource" -) - -func TestAccAWSElasticacheReplicationGroup_importBasic(t *testing.T) { - oldvar := os.Getenv("AWS_DEFAULT_REGION") - os.Setenv("AWS_DEFAULT_REGION", "us-east-1") - defer os.Setenv("AWS_DEFAULT_REGION", oldvar) - - name := acctest.RandString(10) - - resourceName := "aws_elasticache_replication_group.bar" - - resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSElasticacheReplicationDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAWSElasticacheReplicationGroupConfig(name), - }, - - { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"apply_immediately"}, //not in the API - }, - }, - }) -} diff --git a/aws/import_aws_elasticache_subnet_group_test.go b/aws/import_aws_elasticache_subnet_group_test.go deleted file mode 100644 index d1c803dfd03..00000000000 --- a/aws/import_aws_elasticache_subnet_group_test.go +++ /dev/null @@ -1,34 +0,0 @@ -package aws - -import ( - "testing" - - "fmt" - - "github.com/hashicorp/terraform/helper/acctest" - "github.com/hashicorp/terraform/helper/resource" -) - -func TestAccAWSElasticacheSubnetGroup_importBasic(t *testing.T) { - resourceName := "aws_elasticache_subnet_group.bar" - config := fmt.Sprintf(testAccAWSElasticacheSubnetGroupConfig, acctest.RandInt()) - - resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSElasticacheSubnetGroupDestroy, - Steps: []resource.TestStep{ - { - Config: config, - }, - - { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{ - "description"}, - }, - }, - }) -} diff --git a/aws/import_aws_elb_test.go b/aws/import_aws_elb_test.go deleted file mode 100644 index d790409601b..00000000000 --- a/aws/import_aws_elb_test.go +++ /dev/null @@ -1,28 +0,0 @@ -package aws - -import ( - "testing" - - "github.com/hashicorp/terraform/helper/resource" -) - -func TestAccAWSELB_importBasic(t *testing.T) { - resourceName := "aws_elb.bar" - - resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSELBDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAWSELBConfig, - }, - - { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - }, - }, - }) -} diff --git a/aws/import_aws_emr_security_configuration_test.go b/aws/import_aws_emr_security_configuration_test.go deleted file mode 100644 index c2c05b68ea0..00000000000 --- a/aws/import_aws_emr_security_configuration_test.go +++ /dev/null @@ -1,28 +0,0 @@ -package aws - -import ( - "testing" - - "github.com/hashicorp/terraform/helper/resource" -) - -func TestAccAWSEmrSecurityConfiguration_importBasic(t *testing.T) { - resourceName := "aws_emr_security_configuration.foo" - - resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckEmrSecurityConfigurationDestroy, - Steps: []resource.TestStep{ - { - Config: testAccEmrSecurityConfigurationConfig, - }, - - { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - }, - }, - }) -} diff --git a/aws/import_aws_flow_log_test.go b/aws/import_aws_flow_log_test.go deleted file mode 100644 index 57fb209cc0b..00000000000 --- a/aws/import_aws_flow_log_test.go +++ /dev/null @@ -1,31 +0,0 @@ -package aws - -import ( - "testing" - - "github.com/hashicorp/terraform/helper/acctest" - "github.com/hashicorp/terraform/helper/resource" -) - -func TestAccAWSFlowLog_importBasic(t *testing.T) { - resourceName := "aws_flow_log.test_flow_log" - - rInt := acctest.RandInt() - - resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckFlowLogDestroy, - Steps: []resource.TestStep{ - { - Config: testAccFlowLogConfig_basic(rInt), - }, - - { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - }, - }, - }) -} diff --git a/aws/import_aws_glacier_vault_test.go b/aws/import_aws_glacier_vault_test.go deleted file mode 100644 index 95338887ed6..00000000000 --- a/aws/import_aws_glacier_vault_test.go +++ /dev/null @@ -1,30 +0,0 @@ -package aws - -import ( - "testing" - - "github.com/hashicorp/terraform/helper/acctest" - "github.com/hashicorp/terraform/helper/resource" -) - -func TestAccAWSGlacierVault_importBasic(t *testing.T) { - resourceName := "aws_glacier_vault.full" - rInt := acctest.RandInt() - - resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckGlacierVaultDestroy, - Steps: []resource.TestStep{ - { - Config: testAccGlacierVault_full(rInt), - }, - - { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - }, - }, - }) -} diff --git a/aws/import_aws_glue_catalog_database_test.go b/aws/import_aws_glue_catalog_database_test.go deleted file mode 100644 index a84f2d670f3..00000000000 --- a/aws/import_aws_glue_catalog_database_test.go +++ /dev/null @@ -1,29 +0,0 @@ -package aws - -import ( - "testing" - - "github.com/hashicorp/terraform/helper/acctest" - "github.com/hashicorp/terraform/helper/resource" -) - -func TestAccAWSGlueCatalogDatabase_importBasic(t *testing.T) { - resourceName := "aws_glue_catalog_database.test" - rInt := acctest.RandInt() - - resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckGlueDatabaseDestroy, - Steps: []resource.TestStep{ - { - Config: testAccGlueCatalogDatabase_full(rInt, "A test catalog from terraform"), - }, - { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - }, - }, - }) -} diff --git a/aws/import_aws_glue_catalog_table_test.go b/aws/import_aws_glue_catalog_table_test.go deleted file mode 100644 index fec02c38025..00000000000 --- a/aws/import_aws_glue_catalog_table_test.go +++ /dev/null @@ -1,29 +0,0 @@ -package aws - -import ( - "testing" - - "github.com/hashicorp/terraform/helper/acctest" - "github.com/hashicorp/terraform/helper/resource" -) - -func TestAccAWSGlueCatalogTable_importBasic(t *testing.T) { - resourceName := "aws_glue_catalog_table.test" - rInt := acctest.RandInt() - - resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckGlueTableDestroy, - Steps: []resource.TestStep{ - { - Config: testAccGlueCatalogTable_full(rInt, "A test table from terraform"), - }, - { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - }, - }, - }) -} diff --git a/aws/import_aws_iam_account_alias_test.go b/aws/import_aws_iam_account_alias_test.go deleted file mode 100644 index 005aa217361..00000000000 --- a/aws/import_aws_iam_account_alias_test.go +++ /dev/null @@ -1,31 +0,0 @@ -package aws - -import ( - "testing" - - "github.com/hashicorp/terraform/helper/acctest" - "github.com/hashicorp/terraform/helper/resource" -) - -func testAccAWSIAMAccountAlias_importBasic(t *testing.T) { - resourceName := "aws_iam_account_alias.test" - - rstring := acctest.RandString(5) - - resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSIAMAccountAliasDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAWSIAMAccountAliasConfig(rstring), - }, - - { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - }, - }, - }) -} diff --git a/aws/import_aws_iam_account_password_policy_test.go b/aws/import_aws_iam_account_password_policy_test.go deleted file mode 100644 index ec9f0ed4c28..00000000000 --- a/aws/import_aws_iam_account_password_policy_test.go +++ /dev/null @@ -1,28 +0,0 @@ -package aws - -import ( - "testing" - - "github.com/hashicorp/terraform/helper/resource" -) - -func TestAccAWSIAMAccountPasswordPolicy_importBasic(t *testing.T) { - resourceName := "aws_iam_account_password_policy.default" - - resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSIAMAccountPasswordPolicyDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAWSIAMAccountPasswordPolicy, - }, - - { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - }, - }, - }) -} diff --git a/aws/import_aws_iam_group_test.go b/aws/import_aws_iam_group_test.go deleted file mode 100644 index 74c7e701f7b..00000000000 --- a/aws/import_aws_iam_group_test.go +++ /dev/null @@ -1,33 +0,0 @@ -package aws - -import ( - "fmt" - "testing" - - "github.com/hashicorp/terraform/helper/acctest" - "github.com/hashicorp/terraform/helper/resource" -) - -func TestAccAWSIAMGroup_importBasic(t *testing.T) { - resourceName := "aws_iam_group.group" - - rString := acctest.RandString(8) - groupName := fmt.Sprintf("tf-acc-group-import-%s", rString) - - resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSGroupDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAWSGroupConfig(groupName), - }, - - { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - }, - }, - }) -} diff --git a/aws/import_aws_iam_role_policy_test.go b/aws/import_aws_iam_role_policy_test.go deleted file mode 100644 index eec3a213536..00000000000 --- a/aws/import_aws_iam_role_policy_test.go +++ /dev/null @@ -1,55 +0,0 @@ -package aws - -import ( - "fmt" - "testing" - - "github.com/hashicorp/terraform/helper/resource" -) - -func testAccAwsIamRolePolicyConfig(suffix string) string { - return fmt.Sprintf(` -resource "aws_iam_role" "role_%[1]s" { - name = "tf_test_role_test_%[1]s" - path = "/" - assume_role_policy = "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Sid\":\"\",\"Effect\":\"Allow\",\"Principal\":{\"Service\":\"ec2.amazonaws.com\"},\"Action\":\"sts:AssumeRole\"}]}" -} - -resource "aws_iam_role_policy" "foo_%[1]s" { - name = "tf_test_policy_test_%[1]s" - role = "${aws_iam_role.role_%[1]s.name}" - policy = < Date: Mon, 17 Sep 2018 08:52:42 -0400 Subject: [PATCH 156/184] tests/resource/aws_security_group: Allow security group rules per group limit to be configurable via environment variable EC2 regions may manually or automatically had their rules per group limit increased, which will cause the acceptance tests to fail expecting the limit errors at the wrong value. Unfortunately, there is no EC2 or Trusted Advisor API lookup for this particular limit so for now we will allow configuration via `EC2_SECURITY_GROUP_RULES_PER_GROUP_LIMIT` environment variable or it will default to 50. Previously: ``` $ make testacc TEST=./aws TESTARGS='-run=TestAccAWSSecurityGroup_ruleLimit' ==> Checking that code complies with gofmt requirements... TF_ACC=1 go test ./aws -v -run=TestAccAWSSecurityGroup_ruleLimit -timeout 120m === RUN TestAccAWSSecurityGroup_ruleLimitExceededAppend --- FAIL: TestAccAWSSecurityGroup_ruleLimitExceededAppend (45.77s) testing.go:508: Step 1, no error received, but expected a match to: RulesPerSecurityGroupLimitExceeded === RUN TestAccAWSSecurityGroup_ruleLimitCidrBlockExceededAppend --- FAIL: TestAccAWSSecurityGroup_ruleLimitCidrBlockExceededAppend (43.41s) testing.go:508: Step 1, no error received, but expected a match to: RulesPerSecurityGroupLimitExceeded === RUN TestAccAWSSecurityGroup_ruleLimitExceededPrepend --- FAIL: TestAccAWSSecurityGroup_ruleLimitExceededPrepend (46.29s) testing.go:508: Step 1, no error received, but expected a match to: RulesPerSecurityGroupLimitExceeded === RUN TestAccAWSSecurityGroup_ruleLimitExceededAllNew --- FAIL: TestAccAWSSecurityGroup_ruleLimitExceededAllNew (44.27s) testing.go:508: Step 1, no error received, but expected a match to: RulesPerSecurityGroupLimitExceeded FAIL FAIL github.com/terraform-providers/terraform-provider-aws/aws 180.597s ``` Now (in EC2 region with 60 limit): ``` $ export EC2_SECURITY_GROUP_RULES_PER_GROUP_LIMIT=60 $ make testacc TEST=./aws TESTARGS='-run=TestAccAWSSecurityGroup_ruleLimit' ==> Checking that code complies with gofmt requirements... TF_ACC=1 go test ./aws -v -run=TestAccAWSSecurityGroup_ruleLimit -timeout 120m === RUN TestAccAWSSecurityGroup_ruleLimitExceededAppend --- PASS: TestAccAWSSecurityGroup_ruleLimitExceededAppend (69.34s) === RUN TestAccAWSSecurityGroup_ruleLimitCidrBlockExceededAppend --- PASS: TestAccAWSSecurityGroup_ruleLimitCidrBlockExceededAppend (57.70s) === RUN TestAccAWSSecurityGroup_ruleLimitExceededPrepend --- PASS: TestAccAWSSecurityGroup_ruleLimitExceededPrepend (54.87s) === RUN TestAccAWSSecurityGroup_ruleLimitExceededAllNew --- PASS: TestAccAWSSecurityGroup_ruleLimitExceededAllNew (53.67s) PASS ok github.com/terraform-providers/terraform-provider-aws/aws 236.333s ``` --- aws/resource_aws_security_group_test.go | 81 +++++++++++++++++-------- 1 file changed, 56 insertions(+), 25 deletions(-) diff --git a/aws/resource_aws_security_group_test.go b/aws/resource_aws_security_group_test.go index f00748204da..bf9ce130fac 100644 --- a/aws/resource_aws_security_group_test.go +++ b/aws/resource_aws_security_group_test.go @@ -6,6 +6,7 @@ import ( "os" "reflect" "regexp" + "strconv" "strings" "testing" @@ -1802,6 +1803,28 @@ func TestAccAWSSecurityGroup_ipv4andipv6Egress(t *testing.T) { }) } +// testAccAWSSecurityGroupRulesPerGroupLimitFromEnv returns security group rules per group limit +// Currently this information is not available from any EC2 or Trusted Advisor API +// Prefers the EC2_SECURITY_GROUP_RULES_PER_GROUP_LIMIT environment variable or defaults to 50 +func testAccAWSSecurityGroupRulesPerGroupLimitFromEnv() int { + const defaultLimit = 50 + const envVar = "EC2_SECURITY_GROUP_RULES_PER_GROUP_LIMIT" + + envLimitStr := os.Getenv(envVar) + if envLimitStr == "" { + return defaultLimit + } + envLimitInt, err := strconv.Atoi(envLimitStr) + if err != nil { + log.Printf("[WARN] Error converting %q environment variable value %q to integer: %s", envVar, envLimitStr, err) + return defaultLimit + } + if envLimitInt <= 50 { + return defaultLimit + } + return envLimitInt +} + func testAccCheckAWSSecurityGroupSGandCidrAttributes(group *ec2.SecurityGroup) resource.TestCheckFunc { return func(s *terraform.State) error { if *group.GroupName != "terraform_acceptance_test_example" { @@ -1980,6 +2003,8 @@ func TestAccAWSSecurityGroup_failWithDiffMismatch(t *testing.T) { } func TestAccAWSSecurityGroup_ruleLimitExceededAppend(t *testing.T) { + ruleLimit := testAccAWSSecurityGroupRulesPerGroupLimitFromEnv() + var group ec2.SecurityGroup resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -1988,30 +2013,30 @@ func TestAccAWSSecurityGroup_ruleLimitExceededAppend(t *testing.T) { Steps: []resource.TestStep{ // create a valid SG just under the limit { - Config: testAccAWSSecurityGroupConfigRuleLimit(0, 50), + Config: testAccAWSSecurityGroupConfigRuleLimit(0, ruleLimit), Check: resource.ComposeTestCheckFunc( testAccCheckAWSSecurityGroupExists("aws_security_group.test", &group), - testAccCheckAWSSecurityGroupRuleCount(&group, 0, 50), + testAccCheckAWSSecurityGroupRuleCount(&group, 0, ruleLimit), ), }, // append a rule to step over the limit { - Config: testAccAWSSecurityGroupConfigRuleLimit(0, 51), + Config: testAccAWSSecurityGroupConfigRuleLimit(0, ruleLimit+1), ExpectError: regexp.MustCompile("RulesPerSecurityGroupLimitExceeded"), }, { PreConfig: func() { - // should have the 50 original rules still - err := testSecurityGroupRuleCount(*group.GroupId, 0, 50) + // should have the original rules still + err := testSecurityGroupRuleCount(*group.GroupId, 0, ruleLimit) if err != nil { t.Fatalf("PreConfig check failed: %s", err) } }, // running the original config again now should restore the rules - Config: testAccAWSSecurityGroupConfigRuleLimit(0, 50), + Config: testAccAWSSecurityGroupConfigRuleLimit(0, ruleLimit), Check: resource.ComposeTestCheckFunc( testAccCheckAWSSecurityGroupExists("aws_security_group.test", &group), - testAccCheckAWSSecurityGroupRuleCount(&group, 0, 50), + testAccCheckAWSSecurityGroupRuleCount(&group, 0, ruleLimit), ), }, }, @@ -2019,6 +2044,8 @@ func TestAccAWSSecurityGroup_ruleLimitExceededAppend(t *testing.T) { } func TestAccAWSSecurityGroup_ruleLimitCidrBlockExceededAppend(t *testing.T) { + ruleLimit := testAccAWSSecurityGroupRulesPerGroupLimitFromEnv() + var group ec2.SecurityGroup resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -2027,7 +2054,7 @@ func TestAccAWSSecurityGroup_ruleLimitCidrBlockExceededAppend(t *testing.T) { Steps: []resource.TestStep{ // create a valid SG just under the limit { - Config: testAccAWSSecurityGroupConfigCidrBlockRuleLimit(0, 50), + Config: testAccAWSSecurityGroupConfigCidrBlockRuleLimit(0, ruleLimit), Check: resource.ComposeTestCheckFunc( testAccCheckAWSSecurityGroupExists("aws_security_group.test", &group), testAccCheckAWSSecurityGroupRuleCount(&group, 0, 1), @@ -2035,12 +2062,12 @@ func TestAccAWSSecurityGroup_ruleLimitCidrBlockExceededAppend(t *testing.T) { }, // append a rule to step over the limit { - Config: testAccAWSSecurityGroupConfigCidrBlockRuleLimit(0, 51), + Config: testAccAWSSecurityGroupConfigCidrBlockRuleLimit(0, ruleLimit+1), ExpectError: regexp.MustCompile("RulesPerSecurityGroupLimitExceeded"), }, { PreConfig: func() { - // should have the 50 original cidr blocks still in 1 rule + // should have the original cidr blocks still in 1 rule err := testSecurityGroupRuleCount(*group.GroupId, 0, 1) if err != nil { t.Fatalf("PreConfig check failed: %s", err) @@ -2066,12 +2093,12 @@ func TestAccAWSSecurityGroup_ruleLimitCidrBlockExceededAppend(t *testing.T) { t.Fatalf("PreConfig check failed: security group %s not found", id) } - if cidrCount := len(match.IpPermissionsEgress[0].IpRanges); cidrCount != 50 { - t.Fatalf("PreConfig check failed: rule does not have 50 previous IP ranges, has %d", cidrCount) + if cidrCount := len(match.IpPermissionsEgress[0].IpRanges); cidrCount != ruleLimit { + t.Fatalf("PreConfig check failed: rule does not have previous IP ranges, has %d", cidrCount) } }, // running the original config again now should restore the rules - Config: testAccAWSSecurityGroupConfigCidrBlockRuleLimit(0, 50), + Config: testAccAWSSecurityGroupConfigCidrBlockRuleLimit(0, ruleLimit), Check: resource.ComposeTestCheckFunc( testAccCheckAWSSecurityGroupExists("aws_security_group.test", &group), testAccCheckAWSSecurityGroupRuleCount(&group, 0, 1), @@ -2082,6 +2109,8 @@ func TestAccAWSSecurityGroup_ruleLimitCidrBlockExceededAppend(t *testing.T) { } func TestAccAWSSecurityGroup_ruleLimitExceededPrepend(t *testing.T) { + ruleLimit := testAccAWSSecurityGroupRulesPerGroupLimitFromEnv() + var group ec2.SecurityGroup resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -2090,30 +2119,30 @@ func TestAccAWSSecurityGroup_ruleLimitExceededPrepend(t *testing.T) { Steps: []resource.TestStep{ // create a valid SG just under the limit { - Config: testAccAWSSecurityGroupConfigRuleLimit(0, 50), + Config: testAccAWSSecurityGroupConfigRuleLimit(0, ruleLimit), Check: resource.ComposeTestCheckFunc( testAccCheckAWSSecurityGroupExists("aws_security_group.test", &group), - testAccCheckAWSSecurityGroupRuleCount(&group, 0, 50), + testAccCheckAWSSecurityGroupRuleCount(&group, 0, ruleLimit), ), }, // prepend a rule to step over the limit { - Config: testAccAWSSecurityGroupConfigRuleLimit(1, 51), + Config: testAccAWSSecurityGroupConfigRuleLimit(1, ruleLimit+1), ExpectError: regexp.MustCompile("RulesPerSecurityGroupLimitExceeded"), }, { PreConfig: func() { - // should have the 49 original rules still (50 - 1 because of the shift) - err := testSecurityGroupRuleCount(*group.GroupId, 0, 49) + // should have the original rules still (limit - 1 because of the shift) + err := testSecurityGroupRuleCount(*group.GroupId, 0, ruleLimit-1) if err != nil { t.Fatalf("PreConfig check failed: %s", err) } }, // running the original config again now should restore the rules - Config: testAccAWSSecurityGroupConfigRuleLimit(0, 50), + Config: testAccAWSSecurityGroupConfigRuleLimit(0, ruleLimit), Check: resource.ComposeTestCheckFunc( testAccCheckAWSSecurityGroupExists("aws_security_group.test", &group), - testAccCheckAWSSecurityGroupRuleCount(&group, 0, 50), + testAccCheckAWSSecurityGroupRuleCount(&group, 0, ruleLimit), ), }, }, @@ -2121,6 +2150,8 @@ func TestAccAWSSecurityGroup_ruleLimitExceededPrepend(t *testing.T) { } func TestAccAWSSecurityGroup_ruleLimitExceededAllNew(t *testing.T) { + ruleLimit := testAccAWSSecurityGroupRulesPerGroupLimitFromEnv() + var group ec2.SecurityGroup resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -2129,15 +2160,15 @@ func TestAccAWSSecurityGroup_ruleLimitExceededAllNew(t *testing.T) { Steps: []resource.TestStep{ // create a valid SG just under the limit { - Config: testAccAWSSecurityGroupConfigRuleLimit(0, 50), + Config: testAccAWSSecurityGroupConfigRuleLimit(0, ruleLimit), Check: resource.ComposeTestCheckFunc( testAccCheckAWSSecurityGroupExists("aws_security_group.test", &group), - testAccCheckAWSSecurityGroupRuleCount(&group, 0, 50), + testAccCheckAWSSecurityGroupRuleCount(&group, 0, ruleLimit), ), }, // add a rule to step over the limit with entirely new rules { - Config: testAccAWSSecurityGroupConfigRuleLimit(100, 51), + Config: testAccAWSSecurityGroupConfigRuleLimit(100, ruleLimit+1), ExpectError: regexp.MustCompile("RulesPerSecurityGroupLimitExceeded"), }, { @@ -2149,10 +2180,10 @@ func TestAccAWSSecurityGroup_ruleLimitExceededAllNew(t *testing.T) { } }, // running the original config again now should restore the rules - Config: testAccAWSSecurityGroupConfigRuleLimit(0, 50), + Config: testAccAWSSecurityGroupConfigRuleLimit(0, ruleLimit), Check: resource.ComposeTestCheckFunc( testAccCheckAWSSecurityGroupExists("aws_security_group.test", &group), - testAccCheckAWSSecurityGroupRuleCount(&group, 0, 50), + testAccCheckAWSSecurityGroupRuleCount(&group, 0, ruleLimit), ), }, }, From 820a9aec8b20bb0d6a2f3167e0cc75e93a827fa4 Mon Sep 17 00:00:00 2001 From: Baumann Fabrice Date: Mon, 17 Sep 2018 10:13:25 -0400 Subject: [PATCH 157/184] Update sns_topic_policy.html.markdown Missing end curly-bracket to close the aws_iam_policy_document data resource --- website/docs/r/sns_topic_policy.html.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/website/docs/r/sns_topic_policy.html.markdown b/website/docs/r/sns_topic_policy.html.markdown index dca67082675..e3941f6a645 100644 --- a/website/docs/r/sns_topic_policy.html.markdown +++ b/website/docs/r/sns_topic_policy.html.markdown @@ -63,6 +63,7 @@ data "aws_iam_policy_document" "sns-topic-policy" { sid = "__default_statement_ID" } +} ``` ## Argument Reference From 19c2279207ab467f30ced24a0b86bb3b9051d9c4 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Mon, 17 Sep 2018 11:26:24 -0400 Subject: [PATCH 158/184] resource/aws_wafregional_byte_match_set: Properly read byte_match_tuple into Terraform state This converts the `field_to_match` `schema.TypeSet` with `MaxItems: 1` to `schema.TypeList` for simplification and ensures its properly handled during read. This also fixes the invalid test configuration being used in `TestAccAWSWafRegionalByteMatchSet_changeByteMatchTuples` (`METHOD` `fields_to_match` `type` does not use `data` and the API strips the extraneous `data` value). Previously (after adding `d.Set()` error check): ``` --- FAIL: TestAccAWSWafRegionalRateBasedRule_changePredicates (21.39s) testing.go:527: Step 1 error: Error applying: 1 error occurred: * aws_wafregional_byte_match_set.set: 1 error occurred: * aws_wafregional_byte_match_set.set: error setting byte_match_tuple: Invalid address to set: []string{"byte_match_tuple", "0", "field_to_match"} ``` Now: ``` $ make testacc TEST=./aws TESTARGS='-run=TestAccAWSWafRegional\(ByteMatchSet\|RateBasedRule\)_' ==> Checking that code complies with gofmt requirements... TF_ACC=1 go test ./aws -v -run=TestAccAWSWafRegional\(ByteMatchSet\|RateBasedRule\)_ -timeout 120m === RUN TestAccAWSWafRegionalByteMatchSet_basic --- PASS: TestAccAWSWafRegionalByteMatchSet_basic (14.74s) === RUN TestAccAWSWafRegionalByteMatchSet_changeNameForceNew --- PASS: TestAccAWSWafRegionalByteMatchSet_changeNameForceNew (25.20s) === RUN TestAccAWSWafRegionalByteMatchSet_changeByteMatchTuples --- PASS: TestAccAWSWafRegionalByteMatchSet_changeByteMatchTuples (25.18s) === RUN TestAccAWSWafRegionalByteMatchSet_noByteMatchTuples --- PASS: TestAccAWSWafRegionalByteMatchSet_noByteMatchTuples (10.37s) === RUN TestAccAWSWafRegionalByteMatchSet_disappears --- PASS: TestAccAWSWafRegionalByteMatchSet_disappears (11.83s) === RUN TestAccAWSWafRegionalRateBasedRule_basic --- PASS: TestAccAWSWafRegionalRateBasedRule_basic (20.16s) === RUN TestAccAWSWafRegionalRateBasedRule_changeNameForceNew --- PASS: TestAccAWSWafRegionalRateBasedRule_changeNameForceNew (40.48s) === RUN TestAccAWSWafRegionalRateBasedRule_disappears --- PASS: TestAccAWSWafRegionalRateBasedRule_disappears (21.64s) === RUN TestAccAWSWafRegionalRateBasedRule_changePredicates --- PASS: TestAccAWSWafRegionalRateBasedRule_changePredicates (44.00s) === RUN TestAccAWSWafRegionalRateBasedRule_changeRateLimit --- PASS: TestAccAWSWafRegionalRateBasedRule_changeRateLimit (21.72s) === RUN TestAccAWSWafRegionalRateBasedRule_noPredicates --- PASS: TestAccAWSWafRegionalRateBasedRule_noPredicates (14.49s) PASS ok github.com/terraform-providers/terraform-provider-aws/aws 250.679s ``` --- ...resource_aws_wafregional_byte_match_set.go | 65 ++++----- ...rce_aws_wafregional_byte_match_set_test.go | 131 ++++++++++-------- 2 files changed, 104 insertions(+), 92 deletions(-) diff --git a/aws/resource_aws_wafregional_byte_match_set.go b/aws/resource_aws_wafregional_byte_match_set.go index dea71c168d8..f2578764aba 100644 --- a/aws/resource_aws_wafregional_byte_match_set.go +++ b/aws/resource_aws_wafregional_byte_match_set.go @@ -5,7 +5,6 @@ import ( "log" "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/service/waf" "github.com/aws/aws-sdk-go/service/wafregional" "github.com/hashicorp/terraform/helper/schema" @@ -32,7 +31,7 @@ func resourceAwsWafRegionalByteMatchSet() *schema.Resource { Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ "field_to_match": { - Type: schema.TypeSet, + Type: schema.TypeList, Required: true, MaxItems: 1, Elem: &schema.Resource{ @@ -69,7 +68,7 @@ func resourceAwsWafRegionalByteMatchSet() *schema.Resource { Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ "field_to_match": { - Type: schema.TypeSet, + Type: schema.TypeList, Required: true, MaxItems: 1, Elem: &schema.Resource{ @@ -139,20 +138,31 @@ func resourceAwsWafRegionalByteMatchSetRead(d *schema.ResourceData, meta interfa } resp, err := conn.GetByteMatchSet(params) + + if isAWSErr(err, waf.ErrCodeNonexistentItemException, "") { + log.Printf("[WARN] WAF Regional Byte Set Match (%s) not found, removing from state", d.Id()) + d.SetId("") + return nil + } + if err != nil { - if awsErr, ok := err.(awserr.Error); ok && awsErr.Code() == "WAFNonexistentItemException" { - log.Printf("[WARN] WAF IPSet (%s) not found, removing from state", d.Id()) - d.SetId("") - return nil - } + return fmt.Errorf("error getting WAF Regional Byte Match Set (%s): %s", d.Id(), err) + } - return err + if resp == nil || resp.ByteMatchSet == nil { + log.Printf("[WARN] WAF Regional Byte Set Match (%s) not found, removing from state", d.Id()) + d.SetId("") + return nil } if _, ok := d.GetOk("byte_match_tuple"); ok { - d.Set("byte_match_tuple", flattenWafByteMatchTuplesWR(resp.ByteMatchSet.ByteMatchTuples)) + if err := d.Set("byte_match_tuple", flattenWafByteMatchTuplesWR(resp.ByteMatchSet.ByteMatchTuples)); err != nil { + return fmt.Errorf("error setting byte_match_tuple: %s", err) + } } else { - d.Set("byte_match_tuples", flattenWafByteMatchTuplesWR(resp.ByteMatchSet.ByteMatchTuples)) + if err := d.Set("byte_match_tuples", flattenWafByteMatchTuplesWR(resp.ByteMatchSet.ByteMatchTuples)); err != nil { + return fmt.Errorf("error setting byte_match_tuples: %s", err) + } } d.Set("name", resp.ByteMatchSet.Name) @@ -160,30 +170,21 @@ func resourceAwsWafRegionalByteMatchSetRead(d *schema.ResourceData, meta interfa } func flattenWafByteMatchTuplesWR(in []*waf.ByteMatchTuple) []interface{} { - tuples := make([]interface{}, len(in), len(in)) + tuples := make([]interface{}, len(in)) for i, tuple := range in { - field_to_match := tuple.FieldToMatch - m := map[string]interface{}{ - "type": *field_to_match.Type, - } - - if field_to_match.Data == nil { - m["data"] = "" - } else { - m["data"] = *field_to_match.Data + fieldToMatchMap := map[string]interface{}{ + "data": aws.StringValue(tuple.FieldToMatch.Data), + "type": aws.StringValue(tuple.FieldToMatch.Type), } - var ms []map[string]interface{} - ms = append(ms, m) - - tuple := map[string]interface{}{ - "field_to_match": ms, - "positional_constraint": *tuple.PositionalConstraint, - "target_string": tuple.TargetString, - "text_transformation": *tuple.TextTransformation, + m := map[string]interface{}{ + "field_to_match": []map[string]interface{}{fieldToMatchMap}, + "positional_constraint": aws.StringValue(tuple.PositionalConstraint), + "target_string": string(tuple.TargetString), + "text_transformation": aws.StringValue(tuple.TextTransformation), } - tuples[i] = tuple + tuples[i] = m } return tuples @@ -283,7 +284,7 @@ func diffByteMatchSetTuple(oldT, newT []interface{}) []*waf.ByteMatchSetUpdate { updates = append(updates, &waf.ByteMatchSetUpdate{ Action: aws.String(waf.ChangeActionDelete), ByteMatchTuple: &waf.ByteMatchTuple{ - FieldToMatch: expandFieldToMatch(tuple["field_to_match"].(*schema.Set).List()[0].(map[string]interface{})), + FieldToMatch: expandFieldToMatch(tuple["field_to_match"].([]interface{})[0].(map[string]interface{})), PositionalConstraint: aws.String(tuple["positional_constraint"].(string)), TargetString: []byte(tuple["target_string"].(string)), TextTransformation: aws.String(tuple["text_transformation"].(string)), @@ -297,7 +298,7 @@ func diffByteMatchSetTuple(oldT, newT []interface{}) []*waf.ByteMatchSetUpdate { updates = append(updates, &waf.ByteMatchSetUpdate{ Action: aws.String(waf.ChangeActionInsert), ByteMatchTuple: &waf.ByteMatchTuple{ - FieldToMatch: expandFieldToMatch(tuple["field_to_match"].(*schema.Set).List()[0].(map[string]interface{})), + FieldToMatch: expandFieldToMatch(tuple["field_to_match"].([]interface{})[0].(map[string]interface{})), PositionalConstraint: aws.String(tuple["positional_constraint"].(string)), TargetString: []byte(tuple["target_string"].(string)), TextTransformation: aws.String(tuple["text_transformation"].(string)), diff --git a/aws/resource_aws_wafregional_byte_match_set_test.go b/aws/resource_aws_wafregional_byte_match_set_test.go index 62afcaec66f..1c8228b5a80 100644 --- a/aws/resource_aws_wafregional_byte_match_set_test.go +++ b/aws/resource_aws_wafregional_byte_match_set_test.go @@ -8,7 +8,6 @@ import ( "github.com/hashicorp/terraform/terraform" "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/service/waf" "github.com/hashicorp/terraform/helper/acctest" ) @@ -31,25 +30,29 @@ func TestAccAWSWafRegionalByteMatchSet_basic(t *testing.T) { resource.TestCheckResourceAttr( "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.#", "2"), resource.TestCheckResourceAttr( - "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.2174619346.field_to_match.2991901334.data", "referer"), + "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.3483354334.field_to_match.#", "1"), resource.TestCheckResourceAttr( - "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.2174619346.field_to_match.2991901334.type", "HEADER"), + "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.3483354334.field_to_match.0.data", "referer"), resource.TestCheckResourceAttr( - "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.2174619346.positional_constraint", "CONTAINS"), + "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.3483354334.field_to_match.0.type", "HEADER"), resource.TestCheckResourceAttr( - "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.2174619346.target_string", "badrefer1"), + "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.3483354334.positional_constraint", "CONTAINS"), resource.TestCheckResourceAttr( - "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.2174619346.text_transformation", "NONE"), + "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.3483354334.target_string", "badrefer1"), resource.TestCheckResourceAttr( - "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.839525137.field_to_match.2991901334.data", "referer"), + "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.3483354334.text_transformation", "NONE"), resource.TestCheckResourceAttr( - "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.839525137.field_to_match.2991901334.type", "HEADER"), + "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.2081155357.field_to_match.#", "1"), resource.TestCheckResourceAttr( - "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.839525137.positional_constraint", "CONTAINS"), + "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.2081155357.field_to_match.0.data", "referer"), resource.TestCheckResourceAttr( - "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.839525137.target_string", "badrefer2"), + "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.2081155357.field_to_match.0.type", "HEADER"), resource.TestCheckResourceAttr( - "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.839525137.text_transformation", "NONE"), + "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.2081155357.positional_constraint", "CONTAINS"), + resource.TestCheckResourceAttr( + "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.2081155357.target_string", "badrefer2"), + resource.TestCheckResourceAttr( + "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.2081155357.text_transformation", "NONE"), ), }, }, @@ -75,25 +78,29 @@ func TestAccAWSWafRegionalByteMatchSet_changeNameForceNew(t *testing.T) { resource.TestCheckResourceAttr( "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.#", "2"), resource.TestCheckResourceAttr( - "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.2174619346.field_to_match.2991901334.data", "referer"), + "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.3483354334.field_to_match.#", "1"), + resource.TestCheckResourceAttr( + "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.3483354334.field_to_match.0.data", "referer"), resource.TestCheckResourceAttr( - "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.2174619346.field_to_match.2991901334.type", "HEADER"), + "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.3483354334.field_to_match.0.type", "HEADER"), resource.TestCheckResourceAttr( - "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.2174619346.positional_constraint", "CONTAINS"), + "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.3483354334.positional_constraint", "CONTAINS"), resource.TestCheckResourceAttr( - "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.2174619346.target_string", "badrefer1"), + "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.3483354334.target_string", "badrefer1"), resource.TestCheckResourceAttr( - "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.2174619346.text_transformation", "NONE"), + "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.3483354334.text_transformation", "NONE"), resource.TestCheckResourceAttr( - "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.839525137.field_to_match.2991901334.data", "referer"), + "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.2081155357.field_to_match.#", "1"), resource.TestCheckResourceAttr( - "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.839525137.field_to_match.2991901334.type", "HEADER"), + "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.2081155357.field_to_match.0.data", "referer"), resource.TestCheckResourceAttr( - "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.839525137.positional_constraint", "CONTAINS"), + "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.2081155357.field_to_match.0.type", "HEADER"), resource.TestCheckResourceAttr( - "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.839525137.target_string", "badrefer2"), + "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.2081155357.positional_constraint", "CONTAINS"), resource.TestCheckResourceAttr( - "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.839525137.text_transformation", "NONE"), + "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.2081155357.target_string", "badrefer2"), + resource.TestCheckResourceAttr( + "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.2081155357.text_transformation", "NONE"), ), }, { @@ -105,25 +112,29 @@ func TestAccAWSWafRegionalByteMatchSet_changeNameForceNew(t *testing.T) { resource.TestCheckResourceAttr( "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.#", "2"), resource.TestCheckResourceAttr( - "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.2174619346.field_to_match.2991901334.data", "referer"), + "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.3483354334.field_to_match.#", "1"), + resource.TestCheckResourceAttr( + "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.3483354334.field_to_match.0.data", "referer"), + resource.TestCheckResourceAttr( + "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.3483354334.field_to_match.0.type", "HEADER"), resource.TestCheckResourceAttr( - "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.2174619346.field_to_match.2991901334.type", "HEADER"), + "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.3483354334.positional_constraint", "CONTAINS"), resource.TestCheckResourceAttr( - "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.2174619346.positional_constraint", "CONTAINS"), + "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.3483354334.target_string", "badrefer1"), resource.TestCheckResourceAttr( - "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.2174619346.target_string", "badrefer1"), + "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.3483354334.text_transformation", "NONE"), resource.TestCheckResourceAttr( - "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.2174619346.text_transformation", "NONE"), + "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.2081155357.field_to_match.#", "1"), resource.TestCheckResourceAttr( - "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.839525137.field_to_match.2991901334.data", "referer"), + "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.2081155357.field_to_match.0.data", "referer"), resource.TestCheckResourceAttr( - "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.839525137.field_to_match.2991901334.type", "HEADER"), + "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.2081155357.field_to_match.0.type", "HEADER"), resource.TestCheckResourceAttr( - "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.839525137.positional_constraint", "CONTAINS"), + "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.2081155357.positional_constraint", "CONTAINS"), resource.TestCheckResourceAttr( - "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.839525137.target_string", "badrefer2"), + "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.2081155357.target_string", "badrefer2"), resource.TestCheckResourceAttr( - "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.839525137.text_transformation", "NONE"), + "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.2081155357.text_transformation", "NONE"), ), }, }, @@ -148,25 +159,25 @@ func TestAccAWSWafRegionalByteMatchSet_changeByteMatchTuples(t *testing.T) { resource.TestCheckResourceAttr( "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.#", "2"), resource.TestCheckResourceAttr( - "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.2174619346.field_to_match.2991901334.data", "referer"), + "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.3483354334.field_to_match.0.data", "referer"), resource.TestCheckResourceAttr( - "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.2174619346.field_to_match.2991901334.type", "HEADER"), + "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.3483354334.field_to_match.0.type", "HEADER"), resource.TestCheckResourceAttr( - "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.2174619346.positional_constraint", "CONTAINS"), + "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.3483354334.positional_constraint", "CONTAINS"), resource.TestCheckResourceAttr( - "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.2174619346.target_string", "badrefer1"), + "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.3483354334.target_string", "badrefer1"), resource.TestCheckResourceAttr( - "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.2174619346.text_transformation", "NONE"), + "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.3483354334.text_transformation", "NONE"), resource.TestCheckResourceAttr( - "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.839525137.field_to_match.2991901334.data", "referer"), + "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.2081155357.field_to_match.0.data", "referer"), resource.TestCheckResourceAttr( - "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.839525137.field_to_match.2991901334.type", "HEADER"), + "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.2081155357.field_to_match.0.type", "HEADER"), resource.TestCheckResourceAttr( - "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.839525137.positional_constraint", "CONTAINS"), + "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.2081155357.positional_constraint", "CONTAINS"), resource.TestCheckResourceAttr( - "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.839525137.target_string", "badrefer2"), + "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.2081155357.target_string", "badrefer2"), resource.TestCheckResourceAttr( - "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.839525137.text_transformation", "NONE"), + "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.2081155357.text_transformation", "NONE"), ), }, { @@ -178,25 +189,29 @@ func TestAccAWSWafRegionalByteMatchSet_changeByteMatchTuples(t *testing.T) { resource.TestCheckResourceAttr( "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.#", "2"), resource.TestCheckResourceAttr( - "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.2397850647.field_to_match.4253810390.data", "GET"), + "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.2069994922.field_to_match.#", "1"), resource.TestCheckResourceAttr( - "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.2397850647.field_to_match.4253810390.type", "METHOD"), + "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.2069994922.field_to_match.0.data", ""), resource.TestCheckResourceAttr( - "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.2397850647.positional_constraint", "STARTS_WITH"), + "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.2069994922.field_to_match.0.type", "METHOD"), resource.TestCheckResourceAttr( - "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.2397850647.target_string", "badrefer1+"), + "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.2069994922.positional_constraint", "EXACTLY"), resource.TestCheckResourceAttr( - "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.2397850647.text_transformation", "LOWERCASE"), + "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.2069994922.target_string", "GET"), resource.TestCheckResourceAttr( - "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.4153613423.field_to_match.3756326843.data", ""), + "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.2069994922.text_transformation", "NONE"), resource.TestCheckResourceAttr( - "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.4153613423.field_to_match.3756326843.type", "URI"), + "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.2506804529.field_to_match.#", "1"), resource.TestCheckResourceAttr( - "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.4153613423.positional_constraint", "ENDS_WITH"), + "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.2506804529.field_to_match.0.data", ""), resource.TestCheckResourceAttr( - "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.4153613423.target_string", "badrefer2+"), + "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.2506804529.field_to_match.0.type", "URI"), resource.TestCheckResourceAttr( - "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.4153613423.text_transformation", "LOWERCASE"), + "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.2506804529.positional_constraint", "ENDS_WITH"), + resource.TestCheckResourceAttr( + "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.2506804529.target_string", "badrefer2+"), + resource.TestCheckResourceAttr( + "aws_wafregional_byte_match_set.byte_set", "byte_match_tuples.2506804529.text_transformation", "LOWERCASE"), ), }, }, @@ -338,11 +353,8 @@ func testAccCheckAWSWafRegionalByteMatchSetDestroy(s *terraform.State) error { } } - // Return nil if the ByteMatchSet is already destroyed - if awsErr, ok := err.(awserr.Error); ok { - if awsErr.Code() == "WAFNonexistentItemException" { - return nil - } + if isAWSErr(err, waf.ErrCodeNonexistentItemException, "") { + continue } return err @@ -415,12 +427,11 @@ func testAccAWSWafRegionalByteMatchSetConfigChangeByteMatchTuples(name string) s resource "aws_wafregional_byte_match_set" "byte_set" { name = "%s" byte_match_tuples { - text_transformation = "LOWERCASE" - target_string = "badrefer1+" - positional_constraint = "STARTS_WITH" + text_transformation = "NONE" + target_string = "GET" + positional_constraint = "EXACTLY" field_to_match { type = "METHOD" - data = "GET" } } From 355b5f6bd64815ab119e768d950b6cccb2be3cbe Mon Sep 17 00:00:00 2001 From: Jack Bruno Date: Mon, 17 Sep 2018 22:14:31 -0600 Subject: [PATCH 159/184] Add import for aws_iam_role_policy_attachment --- ...resource_aws_iam_role_policy_attachment.go | 20 +++++++++++++++++++ ...rce_aws_iam_role_policy_attachment_test.go | 20 +++++++++++++++++++ .../r/iam_role_policy_attachment.markdown | 8 ++++++++ 3 files changed, 48 insertions(+) diff --git a/aws/resource_aws_iam_role_policy_attachment.go b/aws/resource_aws_iam_role_policy_attachment.go index 24ca6901484..48ac3e91a85 100644 --- a/aws/resource_aws_iam_role_policy_attachment.go +++ b/aws/resource_aws_iam_role_policy_attachment.go @@ -3,6 +3,7 @@ package aws import ( "fmt" "log" + "strings" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/awserr" @@ -16,6 +17,9 @@ func resourceAwsIamRolePolicyAttachment() *schema.Resource { Create: resourceAwsIamRolePolicyAttachmentCreate, Read: resourceAwsIamRolePolicyAttachmentRead, Delete: resourceAwsIamRolePolicyAttachmentDelete, + Importer: &schema.ResourceImporter{ + State: resourceAwsIamRolePolicyAttachmentImport, + }, Schema: map[string]*schema.Schema{ "role": { @@ -103,6 +107,22 @@ func resourceAwsIamRolePolicyAttachmentDelete(d *schema.ResourceData, meta inter return nil } +func resourceAwsIamRolePolicyAttachmentImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { + idParts := strings.SplitN(d.Id(), "/", 2) + if len(idParts) != 2 || idParts[0] == "" || idParts[1] == "" { + return nil, fmt.Errorf("unexpected format of ID (%q), expected /", d.Id()) + } + + roleName := idParts[0] + policyARN := idParts[1] + + d.Set("role", roleName) + d.Set("policy_arn", policyARN) + d.SetId(fmt.Sprintf("%s-%s", roleName, policyARN)) + + return []*schema.ResourceData{d}, nil +} + func attachPolicyToRole(conn *iam.IAM, role string, arn string) error { _, err := conn.AttachRolePolicy(&iam.AttachRolePolicyInput{ RoleName: aws.String(role), diff --git a/aws/resource_aws_iam_role_policy_attachment_test.go b/aws/resource_aws_iam_role_policy_attachment_test.go index 7a723bc077f..55e03e2a2e6 100644 --- a/aws/resource_aws_iam_role_policy_attachment_test.go +++ b/aws/resource_aws_iam_role_policy_attachment_test.go @@ -31,6 +31,11 @@ func TestAccAWSRolePolicyAttachment_basic(t *testing.T) { testAccCheckAWSRolePolicyAttachmentAttributes([]string{testPolicy}, &out), ), }, + { + ResourceName: "aws_iam_role_policy_attachment.test-attach", + ImportState: true, + ImportStateIdFunc: testAccAWSIAMRolePolicyAttachmentImportStateIdFunc, + }, { Config: testAccAWSRolePolicyAttachConfigUpdate(rInt), Check: resource.ComposeTestCheckFunc( @@ -93,6 +98,21 @@ func testAccCheckAWSRolePolicyAttachmentAttributes(policies []string, out *iam.L } } +func testAccAWSIAMRolePolicyAttachmentImportStateIdFunc(s *terraform.State) (string, error) { + resources := s.RootModule().Resources + + roleResource, ok := resources["aws_iam_role.role"] + if !ok { + return "", fmt.Errorf("role not found: aws_iam_role.role") + } + policyResource, ok := resources["aws_iam_policy.policy"] + if !ok { + return "", fmt.Errorf("policy not found: aws_iam_policy.policy") + } + + return fmt.Sprintf("%s/%s", roleResource.Primary.Attributes["name"], policyResource.Primary.Attributes["arn"]), nil +} + func testAccAWSRolePolicyAttachConfig(rInt int) string { return fmt.Sprintf(` resource "aws_iam_role" "role" { diff --git a/website/docs/r/iam_role_policy_attachment.markdown b/website/docs/r/iam_role_policy_attachment.markdown index 902077a0812..8b51c14d033 100644 --- a/website/docs/r/iam_role_policy_attachment.markdown +++ b/website/docs/r/iam_role_policy_attachment.markdown @@ -63,3 +63,11 @@ The following arguments are supported: * `role` (Required) - The role the policy should be applied to * `policy_arn` (Required) - The ARN of the policy you want to apply + +## Import + +IAM role policy attachments can be imported using the role name and policy arn separated by `/`. + +``` +$ terraform import aws_iam_role_policy_attachment.test-attach test-role/arn:aws:iam::xxxxxxxxxxxx:policy/test-policy +``` From b0cc91af909c160755e66ebd840dc55a92ff5d9c Mon Sep 17 00:00:00 2001 From: "Michael H. Oshita" Date: Tue, 18 Sep 2018 14:41:35 +0900 Subject: [PATCH 160/184] Update elasticache_replication_group.html.markdown - T2 node types are supported for Redis 3.2.4+ with cluster mode enabled. - Fix broken link ref: https://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/AutoFailover.html#AutoFailover.Notes --- website/docs/r/elasticache_replication_group.html.markdown | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/website/docs/r/elasticache_replication_group.html.markdown b/website/docs/r/elasticache_replication_group.html.markdown index 70e2982abe2..c80d0b08c07 100644 --- a/website/docs/r/elasticache_replication_group.html.markdown +++ b/website/docs/r/elasticache_replication_group.html.markdown @@ -82,8 +82,7 @@ resource "aws_elasticache_replication_group" "baz" { ~> **Note:** We currently do not support passing a `primary_cluster_id` in order to create the Replication Group. ~> **Note:** Automatic Failover is unavailable for Redis versions earlier than 2.8.6, -and unavailable on T1 and T2 node types. See the [Amazon Replication with -Redis](http://docs.aws.amazon.com/en_en/AmazonElastiCache/latest/UserGuide/Replication.html) guide +and unavailable on T1 node types. For T2 node types, it is only available on Redis version 3.2.4 or later with cluster mode enabled. See the [High Availability Using Replication Groups](https://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/Replication.html) guide for full details on using Replication Groups. ## Argument Reference From a1c1f5a6213fd3221924f79873f5d291d8eef149 Mon Sep 17 00:00:00 2001 From: Sargun Dhillon Date: Mon, 17 Sep 2018 23:03:15 -0700 Subject: [PATCH 161/184] Data Source: aws_ami_ids, add sort_ascending flag This adds the sort ascending flag by creation time to aws_ami_ids, to allow for a list which only ever adds items at the end. This is useful for example, when you have something like this: data "aws_ami_ids" "agent_amis" { owners = ["self"] filter { name = "name" values = ["foo-*"] } } data "aws_region" "current" {} resource "aws_ami_launch_permission" "launch_permissions_1234" { count = "${length(data.aws_ami_ids.agent_amis.ids)}" image_id = "${data.aws_ami_ids.agent_amis.ids[count.index]}" account_id = "1234" } Otherwise, every time a new AMI is added that matches "foo-*", it must "recreate" the launch permissions. Although this may be trivial for launch permissions, on something like AMI copy, it can wreak havoc. It also switches the acceptance test to use two AWS AMIs rather than baking our own. --- aws/data_source_aws_ami.go | 2 +- aws/data_source_aws_ami_ids.go | 8 ++- aws/data_source_aws_ami_ids_test.go | 74 +++++++++++++--------------- aws/sort.go | 9 +++- website/docs/d/ami_ids.html.markdown | 5 +- 5 files changed, 53 insertions(+), 45 deletions(-) diff --git a/aws/data_source_aws_ami.go b/aws/data_source_aws_ami.go index e764e6e813e..88d3bb2c6bb 100644 --- a/aws/data_source_aws_ami.go +++ b/aws/data_source_aws_ami.go @@ -277,7 +277,7 @@ func dataSourceAwsAmiRead(d *schema.ResourceData, meta interface{}) error { // Returns the most recent AMI out of a slice of images. func mostRecentAmi(images []*ec2.Image) *ec2.Image { - return sortImages(images)[0] + return sortImages(images, false)[0] } // populate the numerous fields that the image description returns. diff --git a/aws/data_source_aws_ami_ids.go b/aws/data_source_aws_ami_ids.go index e7e91d3a85a..806bcd86893 100644 --- a/aws/data_source_aws_ami_ids.go +++ b/aws/data_source_aws_ami_ids.go @@ -41,6 +41,11 @@ func dataSourceAwsAmiIds() *schema.Resource { Computed: true, Elem: &schema.Schema{Type: schema.TypeString}, }, + "sort_ascending": { + Type: schema.TypeBool, + Default: false, + Optional: true, + }, }, } } @@ -52,6 +57,7 @@ func dataSourceAwsAmiIdsRead(d *schema.ResourceData, meta interface{}) error { filters, filtersOk := d.GetOk("filter") nameRegex, nameRegexOk := d.GetOk("name_regex") owners, ownersOk := d.GetOk("owners") + sortAscending := d.Get("sort_ascending").(bool) if executableUsersOk == false && filtersOk == false && nameRegexOk == false && ownersOk == false { return fmt.Errorf("One of executable_users, filters, name_regex, or owners must be assigned") @@ -123,7 +129,7 @@ func dataSourceAwsAmiIdsRead(d *schema.ResourceData, meta interface{}) error { filteredImages = resp.Images[:] } - for _, image := range sortImages(filteredImages) { + for _, image := range sortImages(filteredImages, sortAscending) { imageIds = append(imageIds, *image.ImageId) } diff --git a/aws/data_source_aws_ami_ids_test.go b/aws/data_source_aws_ami_ids_test.go index b1b34f306f6..d41e7c2b621 100644 --- a/aws/data_source_aws_ami_ids_test.go +++ b/aws/data_source_aws_ami_ids_test.go @@ -4,7 +4,6 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform/helper/acctest" "github.com/hashicorp/terraform/helper/resource" ) @@ -24,30 +23,35 @@ func TestAccDataSourceAwsAmiIds_basic(t *testing.T) { } func TestAccDataSourceAwsAmiIds_sorted(t *testing.T) { - rName := acctest.RandomWithPrefix("tf-acc-test") - resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, Steps: []resource.TestStep{ { - Config: testAccDataSourceAwsAmiIdsConfig_sorted1(rName), + Config: testAccDataSourceAwsAmiIdsConfig_sorted(false), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttrSet("aws_ami_from_instance.a", "id"), - resource.TestCheckResourceAttrSet("aws_ami_from_instance.b", "id"), + testAccCheckAwsEbsSnapshotDataSourceID("data.aws_ami_ids.test"), + resource.TestCheckResourceAttr("data.aws_ami_ids.test", "ids.#", "2"), + resource.TestCheckResourceAttrPair( + "data.aws_ami_ids.test", "ids.0", + "data.aws_ami.amzn_linux_2018_03", "id"), + resource.TestCheckResourceAttrPair( + "data.aws_ami_ids.test", "ids.1", + "data.aws_ami.amzn_linux_2016_09_0", "id"), ), }, + // Make sure when sort_ascending is set, they're sorted in the inverse order + // it uses the same config / dataset as above so no need to verify the other + // bits { - Config: testAccDataSourceAwsAmiIdsConfig_sorted2(rName), + Config: testAccDataSourceAwsAmiIdsConfig_sorted(true), Check: resource.ComposeTestCheckFunc( - testAccCheckAwsEbsSnapshotDataSourceID("data.aws_ami_ids.test"), - resource.TestCheckResourceAttr("data.aws_ami_ids.test", "ids.#", "2"), resource.TestCheckResourceAttrPair( "data.aws_ami_ids.test", "ids.0", - "aws_ami_from_instance.b", "id"), + "data.aws_ami.amzn_linux_2016_09_0", "id"), resource.TestCheckResourceAttrPair( "data.aws_ami_ids.test", "ids.1", - "aws_ami_from_instance.a", "id"), + "data.aws_ami.amzn_linux_2018_03", "id"), ), }, }, @@ -81,41 +85,33 @@ data "aws_ami_ids" "ubuntu" { } ` -func testAccDataSourceAwsAmiIdsConfig_sorted1(rName string) string { +func testAccDataSourceAwsAmiIdsConfig_sorted(sort_ascending bool) string { return fmt.Sprintf(` -resource "aws_instance" "test" { - ami = "ami-efd0428f" - instance_type = "m3.medium" - - count = 2 -} - -resource "aws_ami_from_instance" "a" { - name = "%s-a" - source_instance_id = "${aws_instance.test.*.id[0]}" - snapshot_without_reboot = true +data "aws_ami" "amzn_linux_2016_09_0" { + owners = ["amazon"] + filter { + name = "name" + values = ["amzn-ami-hvm-2016.09.0.20161028-x86_64-gp2"] + } } -resource "aws_ami_from_instance" "b" { - name = "%s-b" - source_instance_id = "${aws_instance.test.*.id[1]}" - snapshot_without_reboot = true - - // We want to ensure that 'aws_ami_from_instance.a.creation_date' is less - // than 'aws_ami_from_instance.b.creation_date' so that we can ensure that - // the images are being sorted correctly. - depends_on = ["aws_ami_from_instance.a"] -} -`, rName, rName) +data "aws_ami" "amzn_linux_2018_03" { + owners = ["amazon"] + filter { + name = "name" + values = ["amzn-ami-hvm-2018.03.0.20180811-x86_64-gp2"] + } } -func testAccDataSourceAwsAmiIdsConfig_sorted2(rName string) string { - return testAccDataSourceAwsAmiIdsConfig_sorted1(rName) + fmt.Sprintf(` data "aws_ami_ids" "test" { - owners = ["self"] - name_regex = "^%s-" + owners = ["amazon"] + filter { + name = "name" + values = ["amzn-ami-hvm-2018.03.0.20180811-x86_64-gp2", "amzn-ami-hvm-2016.09.0.20161028-x86_64-gp2"] + } + sort_ascending = "%t" } -`, rName) +`, sort_ascending) } const testAccDataSourceAwsAmiIdsConfig_empty = ` diff --git a/aws/sort.go b/aws/sort.go index 0d90458ebf4..638b8424f2d 100644 --- a/aws/sort.go +++ b/aws/sort.go @@ -25,9 +25,14 @@ func (a imageSort) Less(i, j int) bool { } // Sort images by creation date, in descending order. -func sortImages(images []*ec2.Image) []*ec2.Image { +func sortImages(images []*ec2.Image, sortAscending bool) []*ec2.Image { sortedImages := images - sort.Sort(sort.Reverse(imageSort(sortedImages))) + if sortAscending { + sort.Sort(imageSort(sortedImages)) + + } else { + sort.Sort(sort.Reverse(imageSort(sortedImages))) + } return sortedImages } diff --git a/website/docs/d/ami_ids.html.markdown b/website/docs/d/ami_ids.html.markdown index 6e979f76c14..2ef3175d7fc 100644 --- a/website/docs/d/ami_ids.html.markdown +++ b/website/docs/d/ami_ids.html.markdown @@ -46,9 +46,10 @@ options to narrow down the list AWS returns. ~> **NOTE:** At least one of `executable_users`, `filter`, `owners` or `name_regex` must be specified. +* `sort_ascending` - (Defaults to `false`) Used to sort AMIs by creation time. + ## Attributes Reference -`ids` is set to the list of AMI IDs, sorted by creation time in descending -order. +`ids` is set to the list of AMI IDs, sorted by creation time according to `sort_ascending`. [1]: http://docs.aws.amazon.com/cli/latest/reference/ec2/describe-images.html From 8172db0a2bb89cb9397062d6af5bfb978674b32f Mon Sep 17 00:00:00 2001 From: Jordan Johnson-Doyle Date: Fri, 14 Sep 2018 13:29:59 +0100 Subject: [PATCH 162/184] Allow prefix_list_ids on ingress rules in an aws_security_group prefix_list_ids is already allowed on ingress aws_security_group_rules but not available when using inline ingress rules. --- aws/resource_aws_security_group.go | 6 ++ aws/resource_aws_security_group_test.go | 98 ++++++++++++++++++++- website/docs/r/security_group.html.markdown | 1 + 3 files changed, 103 insertions(+), 2 deletions(-) diff --git a/aws/resource_aws_security_group.go b/aws/resource_aws_security_group.go index ea26101fd23..95fc94628b8 100644 --- a/aws/resource_aws_security_group.go +++ b/aws/resource_aws_security_group.go @@ -110,6 +110,12 @@ func resourceAwsSecurityGroup() *schema.Resource { }, }, + "prefix_list_ids": { + Type: schema.TypeList, + Optional: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, + "security_groups": { Type: schema.TypeSet, Optional: true, diff --git a/aws/resource_aws_security_group_test.go b/aws/resource_aws_security_group_test.go index f00748204da..7512b04c134 100644 --- a/aws/resource_aws_security_group_test.go +++ b/aws/resource_aws_security_group_test.go @@ -1753,7 +1753,7 @@ func TestAccAWSSecurityGroup_egressWithPrefixList(t *testing.T) { Config: testAccAWSSecurityGroupConfigPrefixListEgress, Check: resource.ComposeTestCheckFunc( testAccCheckAWSSecurityGroupExists("aws_security_group.egress", &group), - testAccCheckAWSSecurityGroupPrefixListAttributes(&group), + testAccCheckAWSSecurityGroupEgressPrefixListAttributes(&group), resource.TestCheckResourceAttr( "aws_security_group.egress", "egress.#", "1"), ), @@ -1762,6 +1762,27 @@ func TestAccAWSSecurityGroup_egressWithPrefixList(t *testing.T) { }) } +func TestAccAWSSecurityGroup_ingressWithPrefixList(t *testing.T) { + var group ec2.SecurityGroup + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSSecurityGroupDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSSecurityGroupConfigPrefixListIngress, + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSSecurityGroupExists("aws_security_group.ingress", &group), + testAccCheckAWSSecurityGroupIngressPrefixListAttributes(&group), + resource.TestCheckResourceAttr( + "aws_security_group.ingress", "ingress.#", "1"), + ), + }, + }, + }) +} + func TestAccAWSSecurityGroup_ipv4andipv6Egress(t *testing.T) { var group ec2.SecurityGroup @@ -1839,7 +1860,7 @@ func testAccCheckAWSSecurityGroupSGandCidrAttributes(group *ec2.SecurityGroup) r } } -func testAccCheckAWSSecurityGroupPrefixListAttributes(group *ec2.SecurityGroup) resource.TestCheckFunc { +func testAccCheckAWSSecurityGroupEgressPrefixListAttributes(group *ec2.SecurityGroup) resource.TestCheckFunc { return func(s *terraform.State) error { if *group.GroupName != "terraform_acceptance_test_prefix_list_egress" { return fmt.Errorf("Bad name: %s", *group.GroupName) @@ -1864,6 +1885,31 @@ func testAccCheckAWSSecurityGroupPrefixListAttributes(group *ec2.SecurityGroup) } } +func testAccCheckAWSSecurityGroupIngressPrefixListAttributes(group *ec2.SecurityGroup) resource.TestCheckFunc { + return func(s *terraform.State) error { + if *group.GroupName != "terraform_acceptance_test_prefix_list_ingress" { + return fmt.Errorf("Bad name: %s", *group.GroupName) + } + if *group.Description != "Used in the terraform acceptance tests" { + return fmt.Errorf("Bad description: %s", *group.Description) + } + if len(group.IpPermissions) == 0 { + return fmt.Errorf("No IPPerms") + } + if len(group.IpPermissions) != 1 { + return fmt.Errorf("Expected 1 rule, got %d", len(group.IpPermissions)) + } + + p := group.IpPermissions[0] + + if len(p.PrefixListIds) != 1 { + return fmt.Errorf("Expected 1 prefix list, got %d", len(p.PrefixListIds)) + } + + return nil + } +} + func testAccCheckAWSSecurityGroupAttributesChanged(group *ec2.SecurityGroup) resource.TestCheckFunc { return func(s *terraform.State) error { p := []*ec2.IpPermission{ @@ -3407,6 +3453,54 @@ resource "aws_security_group" "egress" { } ` +const testAccAWSSecurityGroupConfigPrefixListIngress = ` +data "aws_region" "current" {} + +resource "aws_vpc" "tf_sg_prefix_list_ingress_test" { + cidr_block = "10.0.0.0/16" + tags { + Name = "terraform-testacc-security-group-prefix-list-ingress" + } +} + +resource "aws_route_table" "default" { + vpc_id = "${aws_vpc.tf_sg_prefix_list_ingress_test.id}" +} + +resource "aws_vpc_endpoint" "test" { + vpc_id = "${aws_vpc.tf_sg_prefix_list_ingress_test.id}" + service_name = "com.amazonaws.${data.aws_region.current.name}.s3" + route_table_ids = ["${aws_route_table.default.id}"] + policy = < Date: Tue, 18 Sep 2018 08:33:42 -0400 Subject: [PATCH 163/184] Reuse 'lookupCloudWatchLogGroup' to read CloudWatch log group. --- aws/data_source_aws_cloudwatch_log_group.go | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/aws/data_source_aws_cloudwatch_log_group.go b/aws/data_source_aws_cloudwatch_log_group.go index b7285b686e4..134f7f5dce7 100644 --- a/aws/data_source_aws_cloudwatch_log_group.go +++ b/aws/data_source_aws_cloudwatch_log_group.go @@ -3,8 +3,6 @@ package aws import ( "fmt" - "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/service/cloudwatchlogs" "github.com/hashicorp/terraform/helper/schema" ) @@ -33,27 +31,10 @@ func dataSourceAwsCloudwatchLogGroupRead(d *schema.ResourceData, meta interface{ name := d.Get("name").(string) conn := meta.(*AWSClient).cloudwatchlogsconn - input := &cloudwatchlogs.DescribeLogGroupsInput{ - LogGroupNamePrefix: aws.String(name), - } - - var logGroup *cloudwatchlogs.LogGroup - // iterate over the pages of log groups until we find the one we are looking for - err := conn.DescribeLogGroupsPages(input, - func(resp *cloudwatchlogs.DescribeLogGroupsOutput, _ bool) bool { - for _, lg := range resp.LogGroups { - if aws.StringValue(lg.LogGroupName) == name { - logGroup = lg - return false - } - } - return true - }) - + logGroup, err := lookupCloudWatchLogGroup(conn, name) if err != nil { return err } - if logGroup == nil { return fmt.Errorf("No log group named %s found\n", name) } From 607c7bbaf92d1d7ab5c0e0c7b326bbd4958ed0e6 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Mon, 17 Sep 2018 21:51:37 -0400 Subject: [PATCH 164/184] resource/aws_instance: Remove default for cpu_credits, add testing for additional scenarios, note behavior with removal of configuration --- aws/resource_aws_instance.go | 17 ++- aws/resource_aws_instance_test.go | 179 +++++++++++++++++++------- website/docs/r/instance.html.markdown | 2 + 3 files changed, 147 insertions(+), 51 deletions(-) diff --git a/aws/resource_aws_instance.go b/aws/resource_aws_instance.go index 64b6550e6bc..e8e44f4d646 100644 --- a/aws/resource_aws_instance.go +++ b/aws/resource_aws_instance.go @@ -479,13 +479,20 @@ func resourceAwsInstance() *schema.Resource { "cpu_credits": { Type: schema.TypeString, Optional: true, - Default: "standard", DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool { - if strings.HasPrefix(d.Get("instance_type").(string), "t3") && - old == "unlimited" && new == "standard" { - return true + // Only work with existing instances + if d.Id() == "" { + return false } - return false + // Only work with missing configurations + if new != "" { + return false + } + // Only work when already set in Terraform state + if old == "" { + return false + } + return true }, }, }, diff --git a/aws/resource_aws_instance_test.go b/aws/resource_aws_instance_test.go index f464c407954..ee7657db8ef 100644 --- a/aws/resource_aws_instance_test.go +++ b/aws/resource_aws_instance_test.go @@ -1523,6 +1523,7 @@ func TestAccAWSInstance_getPasswordData_trueToFalse(t *testing.T) { func TestAccAWSInstance_creditSpecification_unspecifiedDefaultsToStandard(t *testing.T) { var instance ec2.Instance resName := "aws_instance.foo" + rInt := acctest.RandInt() resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -1530,7 +1531,7 @@ func TestAccAWSInstance_creditSpecification_unspecifiedDefaultsToStandard(t *tes CheckDestroy: testAccCheckInstanceDestroy, Steps: []resource.TestStep{ { - Config: testAccInstanceConfig_creditSpecification_unspecified(acctest.RandInt()), + Config: testAccInstanceConfig_creditSpecification_unspecified(rInt), Check: resource.ComposeTestCheckFunc( testAccCheckInstanceExists(resName, &instance), resource.TestCheckResourceAttr(resName, "credit_specification.#", "1"), @@ -1542,8 +1543,9 @@ func TestAccAWSInstance_creditSpecification_unspecifiedDefaultsToStandard(t *tes } func TestAccAWSInstance_creditSpecification_standardCpuCredits(t *testing.T) { - var instance ec2.Instance + var first, second ec2.Instance resName := "aws_instance.foo" + rInt := acctest.RandInt() resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -1551,9 +1553,17 @@ func TestAccAWSInstance_creditSpecification_standardCpuCredits(t *testing.T) { CheckDestroy: testAccCheckInstanceDestroy, Steps: []resource.TestStep{ { - Config: testAccInstanceConfig_creditSpecification_standardCpuCredits(acctest.RandInt()), + Config: testAccInstanceConfig_creditSpecification_standardCpuCredits(rInt), Check: resource.ComposeTestCheckFunc( - testAccCheckInstanceExists(resName, &instance), + testAccCheckInstanceExists(resName, &first), + resource.TestCheckResourceAttr(resName, "credit_specification.#", "1"), + resource.TestCheckResourceAttr(resName, "credit_specification.0.cpu_credits", "standard"), + ), + }, + { + Config: testAccInstanceConfig_creditSpecification_unspecified(rInt), + Check: resource.ComposeTestCheckFunc( + testAccCheckInstanceExists(resName, &second), resource.TestCheckResourceAttr(resName, "credit_specification.#", "1"), resource.TestCheckResourceAttr(resName, "credit_specification.0.cpu_credits", "standard"), ), @@ -1563,8 +1573,9 @@ func TestAccAWSInstance_creditSpecification_standardCpuCredits(t *testing.T) { } func TestAccAWSInstance_creditSpecification_unlimitedCpuCredits(t *testing.T) { - var instance ec2.Instance + var first, second ec2.Instance resName := "aws_instance.foo" + rInt := acctest.RandInt() resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -1572,9 +1583,17 @@ func TestAccAWSInstance_creditSpecification_unlimitedCpuCredits(t *testing.T) { CheckDestroy: testAccCheckInstanceDestroy, Steps: []resource.TestStep{ { - Config: testAccInstanceConfig_creditSpecification_unlimitedCpuCredits(acctest.RandInt()), + Config: testAccInstanceConfig_creditSpecification_unlimitedCpuCredits(rInt), Check: resource.ComposeTestCheckFunc( - testAccCheckInstanceExists(resName, &instance), + testAccCheckInstanceExists(resName, &first), + resource.TestCheckResourceAttr(resName, "credit_specification.#", "1"), + resource.TestCheckResourceAttr(resName, "credit_specification.0.cpu_credits", "unlimited"), + ), + }, + { + Config: testAccInstanceConfig_creditSpecification_unspecified(rInt), + Check: resource.ComposeTestCheckFunc( + testAccCheckInstanceExists(resName, &second), resource.TestCheckResourceAttr(resName, "credit_specification.#", "1"), resource.TestCheckResourceAttr(resName, "credit_specification.0.cpu_credits", "unlimited"), ), @@ -1584,9 +1603,9 @@ func TestAccAWSInstance_creditSpecification_unlimitedCpuCredits(t *testing.T) { } func TestAccAWSInstance_creditSpecification_updateCpuCredits(t *testing.T) { - var before ec2.Instance - var after ec2.Instance + var first, second, third ec2.Instance resName := "aws_instance.foo" + rInt := acctest.RandInt() resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -1594,29 +1613,37 @@ func TestAccAWSInstance_creditSpecification_updateCpuCredits(t *testing.T) { CheckDestroy: testAccCheckInstanceDestroy, Steps: []resource.TestStep{ { - Config: testAccInstanceConfig_creditSpecification_standardCpuCredits(acctest.RandInt()), + Config: testAccInstanceConfig_creditSpecification_standardCpuCredits(rInt), Check: resource.ComposeTestCheckFunc( - testAccCheckInstanceExists(resName, &before), + testAccCheckInstanceExists(resName, &first), resource.TestCheckResourceAttr(resName, "credit_specification.#", "1"), resource.TestCheckResourceAttr(resName, "credit_specification.0.cpu_credits", "standard"), ), }, { - Config: testAccInstanceConfig_creditSpecification_unlimitedCpuCredits(acctest.RandInt()), + Config: testAccInstanceConfig_creditSpecification_unlimitedCpuCredits(rInt), Check: resource.ComposeTestCheckFunc( - testAccCheckInstanceExists(resName, &after), + testAccCheckInstanceExists(resName, &second), resource.TestCheckResourceAttr(resName, "credit_specification.#", "1"), resource.TestCheckResourceAttr(resName, "credit_specification.0.cpu_credits", "unlimited"), ), }, + { + Config: testAccInstanceConfig_creditSpecification_standardCpuCredits(rInt), + Check: resource.ComposeTestCheckFunc( + testAccCheckInstanceExists(resName, &third), + resource.TestCheckResourceAttr(resName, "credit_specification.#", "1"), + resource.TestCheckResourceAttr(resName, "credit_specification.0.cpu_credits", "standard"), + ), + }, }, }) } -func TestAccAWSInstance_creditSpecification_removalReturnsStandard(t *testing.T) { - var before ec2.Instance - var after ec2.Instance +func TestAccAWSInstance_creditSpecification_isNotAppliedToNonBurstable(t *testing.T) { + var instance ec2.Instance resName := "aws_instance.foo" + rInt := acctest.RandInt() resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -1624,28 +1651,41 @@ func TestAccAWSInstance_creditSpecification_removalReturnsStandard(t *testing.T) CheckDestroy: testAccCheckInstanceDestroy, Steps: []resource.TestStep{ { - Config: testAccInstanceConfig_creditSpecification_unlimitedCpuCredits(acctest.RandInt()), + Config: testAccInstanceConfig_creditSpecification_isNotAppliedToNonBurstable(rInt), Check: resource.ComposeTestCheckFunc( - testAccCheckInstanceExists(resName, &before), - resource.TestCheckResourceAttr(resName, "credit_specification.#", "1"), - resource.TestCheckResourceAttr(resName, "credit_specification.0.cpu_credits", "unlimited"), + testAccCheckInstanceExists(resName, &instance), ), }, + }, + }) +} + +func TestAccAWSInstance_creditSpecificationT3_unspecifiedDefaultsToUnlimited(t *testing.T) { + var instance ec2.Instance + resName := "aws_instance.foo" + rInt := acctest.RandInt() + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckInstanceDestroy, + Steps: []resource.TestStep{ { - Config: testAccInstanceConfig_creditSpecification_unspecified(acctest.RandInt()), + Config: testAccInstanceConfig_creditSpecification_unspecified_t3(rInt), Check: resource.ComposeTestCheckFunc( - testAccCheckInstanceExists(resName, &after), + testAccCheckInstanceExists(resName, &instance), resource.TestCheckResourceAttr(resName, "credit_specification.#", "1"), - resource.TestCheckResourceAttr(resName, "credit_specification.0.cpu_credits", "standard"), + resource.TestCheckResourceAttr(resName, "credit_specification.0.cpu_credits", "unlimited"), ), }, }, }) } -func TestAccAWSInstance_creditSpecification_isNotAppliedToNonBurstable(t *testing.T) { - var instance ec2.Instance +func TestAccAWSInstance_creditSpecificationT3_standardCpuCredits(t *testing.T) { + var first, second ec2.Instance resName := "aws_instance.foo" + rInt := acctest.RandInt() resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -1653,18 +1693,29 @@ func TestAccAWSInstance_creditSpecification_isNotAppliedToNonBurstable(t *testin CheckDestroy: testAccCheckInstanceDestroy, Steps: []resource.TestStep{ { - Config: testAccInstanceConfig_creditSpecification_isNotAppliedToNonBurstable(acctest.RandInt()), + Config: testAccInstanceConfig_creditSpecification_standardCpuCredits_t3(rInt), Check: resource.ComposeTestCheckFunc( - testAccCheckInstanceExists(resName, &instance), + testAccCheckInstanceExists(resName, &first), + resource.TestCheckResourceAttr(resName, "credit_specification.#", "1"), + resource.TestCheckResourceAttr(resName, "credit_specification.0.cpu_credits", "standard"), + ), + }, + { + Config: testAccInstanceConfig_creditSpecification_unspecified_t3(rInt), + Check: resource.ComposeTestCheckFunc( + testAccCheckInstanceExists(resName, &second), + resource.TestCheckResourceAttr(resName, "credit_specification.#", "1"), + resource.TestCheckResourceAttr(resName, "credit_specification.0.cpu_credits", "standard"), ), }, }, }) } -func TestAccAWSInstance_creditSpecificationT3_unspecifiedDefaultsToUnlimited(t *testing.T) { - var instance ec2.Instance +func TestAccAWSInstance_creditSpecificationT3_unlimitedCpuCredits(t *testing.T) { + var first, second ec2.Instance resName := "aws_instance.foo" + rInt := acctest.RandInt() resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -1672,9 +1723,17 @@ func TestAccAWSInstance_creditSpecificationT3_unspecifiedDefaultsToUnlimited(t * CheckDestroy: testAccCheckInstanceDestroy, Steps: []resource.TestStep{ { - Config: testAccInstanceConfig_creditSpecification_unspecified_t3(acctest.RandInt()), + Config: testAccInstanceConfig_creditSpecification_unlimitedCpuCredits_t3(rInt), Check: resource.ComposeTestCheckFunc( - testAccCheckInstanceExists(resName, &instance), + testAccCheckInstanceExists(resName, &first), + resource.TestCheckResourceAttr(resName, "credit_specification.#", "1"), + resource.TestCheckResourceAttr(resName, "credit_specification.0.cpu_credits", "unlimited"), + ), + }, + { + Config: testAccInstanceConfig_creditSpecification_unspecified_t3(rInt), + Check: resource.ComposeTestCheckFunc( + testAccCheckInstanceExists(resName, &second), resource.TestCheckResourceAttr(resName, "credit_specification.#", "1"), resource.TestCheckResourceAttr(resName, "credit_specification.0.cpu_credits", "unlimited"), ), @@ -1683,9 +1742,10 @@ func TestAccAWSInstance_creditSpecificationT3_unspecifiedDefaultsToUnlimited(t * }) } -func TestAccAWSInstance_creditSpecificationT3_standardCpuCredits(t *testing.T) { - var instance ec2.Instance +func TestAccAWSInstance_creditSpecificationT3_updateCpuCredits(t *testing.T) { + var first, second, third ec2.Instance resName := "aws_instance.foo" + rInt := acctest.RandInt() resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -1693,9 +1753,25 @@ func TestAccAWSInstance_creditSpecificationT3_standardCpuCredits(t *testing.T) { CheckDestroy: testAccCheckInstanceDestroy, Steps: []resource.TestStep{ { - Config: testAccInstanceConfig_creditSpecification_standardCpuCredits_t3(acctest.RandInt()), + Config: testAccInstanceConfig_creditSpecification_standardCpuCredits_t3(rInt), Check: resource.ComposeTestCheckFunc( - testAccCheckInstanceExists(resName, &instance), + testAccCheckInstanceExists(resName, &first), + resource.TestCheckResourceAttr(resName, "credit_specification.#", "1"), + resource.TestCheckResourceAttr(resName, "credit_specification.0.cpu_credits", "standard"), + ), + }, + { + Config: testAccInstanceConfig_creditSpecification_unlimitedCpuCredits_t3(rInt), + Check: resource.ComposeTestCheckFunc( + testAccCheckInstanceExists(resName, &second), + resource.TestCheckResourceAttr(resName, "credit_specification.#", "1"), + resource.TestCheckResourceAttr(resName, "credit_specification.0.cpu_credits", "unlimited"), + ), + }, + { + Config: testAccInstanceConfig_creditSpecification_standardCpuCredits_t3(rInt), + Check: resource.ComposeTestCheckFunc( + testAccCheckInstanceExists(resName, &third), resource.TestCheckResourceAttr(resName, "credit_specification.#", "1"), resource.TestCheckResourceAttr(resName, "credit_specification.0.cpu_credits", "standard"), ), @@ -1704,9 +1780,10 @@ func TestAccAWSInstance_creditSpecificationT3_standardCpuCredits(t *testing.T) { }) } -func TestAccAWSInstance_creditSpecificationT3_unlimitedCpuCredits(t *testing.T) { - var instance ec2.Instance +func TestAccAWSInstance_creditSpecification_standardCpuCredits_t2Tot3Taint(t *testing.T) { + var before, after ec2.Instance resName := "aws_instance.foo" + rInt := acctest.RandInt() resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -1714,21 +1791,30 @@ func TestAccAWSInstance_creditSpecificationT3_unlimitedCpuCredits(t *testing.T) CheckDestroy: testAccCheckInstanceDestroy, Steps: []resource.TestStep{ { - Config: testAccInstanceConfig_creditSpecification_unlimitedCpuCredits_t3(acctest.RandInt()), + Config: testAccInstanceConfig_creditSpecification_standardCpuCredits(rInt), Check: resource.ComposeTestCheckFunc( - testAccCheckInstanceExists(resName, &instance), + testAccCheckInstanceExists(resName, &before), resource.TestCheckResourceAttr(resName, "credit_specification.#", "1"), - resource.TestCheckResourceAttr(resName, "credit_specification.0.cpu_credits", "unlimited"), + resource.TestCheckResourceAttr(resName, "credit_specification.0.cpu_credits", "standard"), + ), + }, + { + Config: testAccInstanceConfig_creditSpecification_standardCpuCredits_t3(rInt), + Check: resource.ComposeTestCheckFunc( + testAccCheckInstanceExists(resName, &after), + resource.TestCheckResourceAttr(resName, "credit_specification.#", "1"), + resource.TestCheckResourceAttr(resName, "credit_specification.0.cpu_credits", "standard"), ), + Taint: []string{resName}, }, }, }) } -func TestAccAWSInstance_creditSpecificationT3_updateCpuCredits(t *testing.T) { - var before ec2.Instance - var after ec2.Instance +func TestAccAWSInstance_creditSpecification_unlimitedCpuCredits_t2Tot3Taint(t *testing.T) { + var before, after ec2.Instance resName := "aws_instance.foo" + rInt := acctest.RandInt() resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -1736,20 +1822,21 @@ func TestAccAWSInstance_creditSpecificationT3_updateCpuCredits(t *testing.T) { CheckDestroy: testAccCheckInstanceDestroy, Steps: []resource.TestStep{ { - Config: testAccInstanceConfig_creditSpecification_standardCpuCredits_t3(acctest.RandInt()), + Config: testAccInstanceConfig_creditSpecification_unlimitedCpuCredits(rInt), Check: resource.ComposeTestCheckFunc( testAccCheckInstanceExists(resName, &before), resource.TestCheckResourceAttr(resName, "credit_specification.#", "1"), - resource.TestCheckResourceAttr(resName, "credit_specification.0.cpu_credits", "standard"), + resource.TestCheckResourceAttr(resName, "credit_specification.0.cpu_credits", "unlimited"), ), }, { - Config: testAccInstanceConfig_creditSpecification_unlimitedCpuCredits_t3(acctest.RandInt()), + Config: testAccInstanceConfig_creditSpecification_unlimitedCpuCredits_t3(rInt), Check: resource.ComposeTestCheckFunc( testAccCheckInstanceExists(resName, &after), resource.TestCheckResourceAttr(resName, "credit_specification.#", "1"), resource.TestCheckResourceAttr(resName, "credit_specification.0.cpu_credits", "unlimited"), ), + Taint: []string{resName}, }, }, }) diff --git a/website/docs/r/instance.html.markdown b/website/docs/r/instance.html.markdown index c90e398ae6b..e62890bbf5d 100644 --- a/website/docs/r/instance.html.markdown +++ b/website/docs/r/instance.html.markdown @@ -192,6 +192,8 @@ Each `network_interface` block supports the following: ### Credit Specification +~> **NOTE:** Removing this configuration on existing instances will only stop managing it. It will not change the configuration back to the default for the instance type. + Credit specification can be applied/modified to the EC2 Instance at any time. The `credit_specification` block supports the following: From 91b6ba7b67e07b144b9a66726055e2743a0e5726 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 18 Sep 2018 13:06:44 -0400 Subject: [PATCH 165/184] tests/provider: Add missing testSweepSkipSweepError() handling To prevent sweeper errors when running in unsupported regions/partitions, e.g. ``` [16:53:32][Step 2/4] 2018/09/18 16:53:32 [DEBUG] [aws-sdk-go] DEBUG: Send Request eks/ListClusters failed, not retrying, error RequestError: send request failed [16:53:32][Step 2/4] caused by: Get https://eks.us-east-2.amazonaws.com/clusters: dial tcp: lookup eks.us-east-2.amazonaws.com on 192.168.22.2:53: no such host [16:53:32][Step 2/4] 2018/09/18 16:53:32 [ERR] error running (aws_subnet): Error retrieving EKS Clusters: RequestError: send request failed [16:53:32][Step 2/4] caused by: Get https://eks.us-east-2.amazonaws.com/clusters: dial tcp: lookup eks.us-east-2.amazonaws.com on 192.168.22.2:53: no such host [16:53:32][Step 2/4] FAIL github.com/terraform-providers/terraform-provider-aws/aws 14.195s ``` --- aws/resource_aws_acmpca_certificate_authority_test.go | 4 ++++ aws/resource_aws_config_aggregate_authorization_test.go | 4 ++++ aws/resource_aws_config_configuration_aggregator_test.go | 4 ++++ aws/resource_aws_config_configuration_recorder_test.go | 4 ++++ aws/resource_aws_config_delivery_channel_test.go | 4 ++++ aws/resource_aws_eks_cluster_test.go | 4 ++++ 6 files changed, 24 insertions(+) diff --git a/aws/resource_aws_acmpca_certificate_authority_test.go b/aws/resource_aws_acmpca_certificate_authority_test.go index ccee6ae9eab..8dc93fb7c6b 100644 --- a/aws/resource_aws_acmpca_certificate_authority_test.go +++ b/aws/resource_aws_acmpca_certificate_authority_test.go @@ -29,6 +29,10 @@ func testSweepAcmpcaCertificateAuthorities(region string) error { certificateAuthorities, err := listAcmpcaCertificateAuthorities(conn) if err != nil { + if testSweepSkipSweepError(err) { + log.Printf("[WARN] Skipping ACMPCA Certificate Authorities sweep for %s: %s", region, err) + return nil + } return fmt.Errorf("Error retrieving ACMPCA Certificate Authorities: %s", err) } if len(certificateAuthorities) == 0 { diff --git a/aws/resource_aws_config_aggregate_authorization_test.go b/aws/resource_aws_config_aggregate_authorization_test.go index 06b1f64c044..703b7345959 100644 --- a/aws/resource_aws_config_aggregate_authorization_test.go +++ b/aws/resource_aws_config_aggregate_authorization_test.go @@ -29,6 +29,10 @@ func testSweepConfigAggregateAuthorizations(region string) error { aggregateAuthorizations, err := describeConfigAggregateAuthorizations(conn) if err != nil { + if testSweepSkipSweepError(err) { + log.Printf("[WARN] Skipping Config Aggregate Authorizations sweep for %s: %s", region, err) + return nil + } return fmt.Errorf("Error retrieving config aggregate authorizations: %s", err) } diff --git a/aws/resource_aws_config_configuration_aggregator_test.go b/aws/resource_aws_config_configuration_aggregator_test.go index a46d5a2cef3..8f47fcecc98 100644 --- a/aws/resource_aws_config_configuration_aggregator_test.go +++ b/aws/resource_aws_config_configuration_aggregator_test.go @@ -30,6 +30,10 @@ func testSweepConfigConfigurationAggregators(region string) error { resp, err := conn.DescribeConfigurationAggregators(&configservice.DescribeConfigurationAggregatorsInput{}) if err != nil { + if testSweepSkipSweepError(err) { + log.Printf("[WARN] Skipping Config Configuration Aggregators sweep for %s: %s", region, err) + return nil + } return fmt.Errorf("Error retrieving config configuration aggregators: %s", err) } diff --git a/aws/resource_aws_config_configuration_recorder_test.go b/aws/resource_aws_config_configuration_recorder_test.go index f8a4ac848d4..397ac797d86 100644 --- a/aws/resource_aws_config_configuration_recorder_test.go +++ b/aws/resource_aws_config_configuration_recorder_test.go @@ -30,6 +30,10 @@ func testSweepConfigConfigurationRecorder(region string) error { req := &configservice.DescribeConfigurationRecordersInput{} resp, err := conn.DescribeConfigurationRecorders(req) if err != nil { + if testSweepSkipSweepError(err) { + log.Printf("[WARN] Skipping Config Configuration Recorders sweep for %s: %s", region, err) + return nil + } return fmt.Errorf("Error describing Configuration Recorders: %s", err) } diff --git a/aws/resource_aws_config_delivery_channel_test.go b/aws/resource_aws_config_delivery_channel_test.go index 1fb4ff950ba..3fc71cec4fd 100644 --- a/aws/resource_aws_config_delivery_channel_test.go +++ b/aws/resource_aws_config_delivery_channel_test.go @@ -46,6 +46,10 @@ func testSweepConfigDeliveryChannels(region string) error { return nil }) if err != nil { + if testSweepSkipSweepError(err) { + log.Printf("[WARN] Skipping Config Delivery Channels sweep for %s: %s", region, err) + return nil + } return fmt.Errorf("Error describing Delivery Channels: %s", err) } diff --git a/aws/resource_aws_eks_cluster_test.go b/aws/resource_aws_eks_cluster_test.go index 9bba6bf37fc..8d63b870ec8 100644 --- a/aws/resource_aws_eks_cluster_test.go +++ b/aws/resource_aws_eks_cluster_test.go @@ -33,6 +33,10 @@ func testSweepEksClusters(region string) error { for { out, err := conn.ListClusters(input) if err != nil { + if testSweepSkipSweepError(err) { + log.Printf("[WARN] Skipping EKS Clusters sweep for %s: %s", region, err) + return nil + } return fmt.Errorf("Error retrieving EKS Clusters: %s", err) } From 152c29797b4d06341730bf0616f7d99b26d42dc6 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 18 Sep 2018 13:21:33 -0400 Subject: [PATCH 166/184] Update CHANGELOG for #5805 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 162e5d82521..e4370a69f26 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ BUG FIXES: * resource/aws_config_config_rule: Prevent panic when specifying empty `scope` [GH-5852] * resource/aws_iam_policy: Ensure `description` is properly read into Terraform state during resource creation [GH-5884] +* resource/aws_instance: Properly handle `credit_specifications` with T3 instance types [GH-5805] * resource/aws_launch_template: Fix handling of `network_interface` `ipv6_addresses` [GH-5883] * resource/aws_s3_bucket: Prevent panics with various API read failures [GH-5842] * resource/aws_s3_bucket: Prevent `NoSuchBucket` error on deletion [GH-5842] From 49593582deb798600a5e00e9b40bd56bd2b593b4 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 18 Sep 2018 13:42:43 -0400 Subject: [PATCH 167/184] resource/aws_launch_template: Support credit_specification configuration of T3 instance types ``` $ make testacc TEST=./aws TESTARGS='-run=TestAccAWSLaunchTemplate_' ==> Checking that code complies with gofmt requirements... TF_ACC=1 go test ./aws -v -run=TestAccAWSLaunchTemplate_ -timeout 120m === RUN TestAccAWSLaunchTemplate_importBasic --- PASS: TestAccAWSLaunchTemplate_importBasic (14.07s) === RUN TestAccAWSLaunchTemplate_importData --- PASS: TestAccAWSLaunchTemplate_importData (11.44s) === RUN TestAccAWSLaunchTemplate_basic --- PASS: TestAccAWSLaunchTemplate_basic (12.69s) === RUN TestAccAWSLaunchTemplate_BlockDeviceMappings_EBS --- PASS: TestAccAWSLaunchTemplate_BlockDeviceMappings_EBS (49.13s) === RUN TestAccAWSLaunchTemplate_BlockDeviceMappings_EBS_DeleteOnTermination --- PASS: TestAccAWSLaunchTemplate_BlockDeviceMappings_EBS_DeleteOnTermination (49.96s) === RUN TestAccAWSLaunchTemplate_data --- PASS: TestAccAWSLaunchTemplate_data (12.07s) === RUN TestAccAWSLaunchTemplate_update --- PASS: TestAccAWSLaunchTemplate_update (46.23s) === RUN TestAccAWSLaunchTemplate_tags --- PASS: TestAccAWSLaunchTemplate_tags (21.18s) === RUN TestAccAWSLaunchTemplate_creditSpecification_nonBurstable --- PASS: TestAccAWSLaunchTemplate_creditSpecification_nonBurstable (11.90s) === RUN TestAccAWSLaunchTemplate_creditSpecification_t2 --- PASS: TestAccAWSLaunchTemplate_creditSpecification_t2 (10.68s) === RUN TestAccAWSLaunchTemplate_creditSpecification_t3 --- PASS: TestAccAWSLaunchTemplate_creditSpecification_t3 (11.85s) === RUN TestAccAWSLaunchTemplate_networkInterface --- PASS: TestAccAWSLaunchTemplate_networkInterface (32.63s) === RUN TestAccAWSLaunchTemplate_networkInterface_ipv6Addresses --- PASS: TestAccAWSLaunchTemplate_networkInterface_ipv6Addresses (10.59s) PASS ok github.com/terraform-providers/terraform-provider-aws/aws 295.142s ``` --- aws/resource_aws_launch_template.go | 4 +- aws/resource_aws_launch_template_test.go | 67 +++++++++++++++++++----- 2 files changed, 57 insertions(+), 14 deletions(-) diff --git a/aws/resource_aws_launch_template.go b/aws/resource_aws_launch_template.go index 92a2afda31b..e0776fe432c 100644 --- a/aws/resource_aws_launch_template.go +++ b/aws/resource_aws_launch_template.go @@ -563,7 +563,7 @@ func resourceAwsLaunchTemplateRead(d *schema.ResourceData, meta interface{}) err return err } - if strings.HasPrefix(aws.StringValue(ltData.InstanceType), "t2") { + if strings.HasPrefix(aws.StringValue(ltData.InstanceType), "t2") || strings.HasPrefix(aws.StringValue(ltData.InstanceType), "t3") { if err := d.Set("credit_specification", getCreditSpecification(ltData.CreditSpecification)); err != nil { return err } @@ -903,7 +903,7 @@ func buildLaunchTemplateData(d *schema.ResourceData, meta interface{}) (*ec2.Req opts.BlockDeviceMappings = blockDeviceMappings } - if v, ok := d.GetOk("credit_specification"); ok && strings.HasPrefix(instanceType, "t2") { + if v, ok := d.GetOk("credit_specification"); ok && (strings.HasPrefix(instanceType, "t2") || strings.HasPrefix(instanceType, "t3")) { cs := v.([]interface{}) if len(cs) > 0 { diff --git a/aws/resource_aws_launch_template_test.go b/aws/resource_aws_launch_template_test.go index f1a99eae79c..0f6aad9b45f 100644 --- a/aws/resource_aws_launch_template_test.go +++ b/aws/resource_aws_launch_template_test.go @@ -121,7 +121,6 @@ func TestAccAWSLaunchTemplate_data(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckAWSLaunchTemplateExists(resName, &template), resource.TestCheckResourceAttr(resName, "block_device_mappings.#", "1"), - resource.TestCheckResourceAttr(resName, "credit_specification.#", "1"), resource.TestCheckResourceAttrSet(resName, "disable_api_termination"), resource.TestCheckResourceAttr(resName, "ebs_optimized", "false"), resource.TestCheckResourceAttr(resName, "elastic_gpu_specifications.#", "1"), @@ -208,8 +207,29 @@ func TestAccAWSLaunchTemplate_tags(t *testing.T) { }) } -func TestAccAWSLaunchTemplate_nonBurstable(t *testing.T) { +func TestAccAWSLaunchTemplate_creditSpecification_nonBurstable(t *testing.T) { + var template ec2.LaunchTemplate + rName := acctest.RandomWithPrefix("tf-acc-test") + resName := "aws_launch_template.foo" + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSLaunchTemplateDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSLaunchTemplateConfig_creditSpecification(rName, "m1.small", "standard"), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSLaunchTemplateExists(resName, &template), + ), + }, + }, + }) +} + +func TestAccAWSLaunchTemplate_creditSpecification_t2(t *testing.T) { var template ec2.LaunchTemplate + rName := acctest.RandomWithPrefix("tf-acc-test") resName := "aws_launch_template.foo" resource.Test(t, resource.TestCase{ @@ -218,9 +238,33 @@ func TestAccAWSLaunchTemplate_nonBurstable(t *testing.T) { CheckDestroy: testAccCheckAWSLaunchTemplateDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSLaunchTemplateConfig_nonBurstable, + Config: testAccAWSLaunchTemplateConfig_creditSpecification(rName, "t2.micro", "unlimited"), Check: resource.ComposeTestCheckFunc( testAccCheckAWSLaunchTemplateExists(resName, &template), + resource.TestCheckResourceAttr(resName, "credit_specification.#", "1"), + resource.TestCheckResourceAttr(resName, "credit_specification.0.cpu_credits", "unlimited"), + ), + }, + }, + }) +} + +func TestAccAWSLaunchTemplate_creditSpecification_t3(t *testing.T) { + var template ec2.LaunchTemplate + rName := acctest.RandomWithPrefix("tf-acc-test") + resName := "aws_launch_template.foo" + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSLaunchTemplateDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSLaunchTemplateConfig_creditSpecification(rName, "t3.micro", "unlimited"), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSLaunchTemplateExists(resName, &template), + resource.TestCheckResourceAttr(resName, "credit_specification.#", "1"), + resource.TestCheckResourceAttr(resName, "credit_specification.0.cpu_credits", "unlimited"), ), }, }, @@ -449,10 +493,6 @@ resource "aws_launch_template" "foo" { device_name = "test" } - credit_specification { - cpu_credits = "standard" - } - disable_api_termination = true ebs_optimized = false @@ -518,15 +558,18 @@ resource "aws_launch_template" "foo" { `, rInt) } -const testAccAWSLaunchTemplateConfig_nonBurstable = ` +func testAccAWSLaunchTemplateConfig_creditSpecification(rName, instanceType, cpuCredits string) string { + return fmt.Sprintf(` resource "aws_launch_template" "foo" { - name = "non-burstable-launch-template" - instance_type = "m1.small" + instance_type = %q + name = %q + credit_specification { - cpu_credits = "standard" + cpu_credits = %q } } -` +`, instanceType, rName, cpuCredits) +} const testAccAWSLaunchTemplateConfig_networkInterface = ` resource "aws_vpc" "test" { From 78f126f000b924704c877d3b69885f9f6a1ac1e1 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 18 Sep 2018 15:18:24 -0400 Subject: [PATCH 168/184] Update CHANGELOG for #5916 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e4370a69f26..40767748878 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ FEATURES: ENHANCEMENTS: * resource/aws_s3_bucket_inventory: Allow SSE-S3 encryption [GH-5870] +* resource/aws_security_group: Add `prefix_list_ids` argument for `ingress` rules [GH-5916] BUG FIXES: From 80e70e927f8178d7181c3c5011bc58e34114b3b8 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 18 Sep 2018 15:38:48 -0400 Subject: [PATCH 169/184] Update CHANGELOG for #5912 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 40767748878..f73aeab8c67 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ FEATURES: ENHANCEMENTS: +* data-source/aws_ami_ids: Add `sort_ascending` argument [GH-5912] * resource/aws_s3_bucket_inventory: Allow SSE-S3 encryption [GH-5870] * resource/aws_security_group: Add `prefix_list_ids` argument for `ingress` rules [GH-5916] From 471c29adfc0857ba2e46f801207deab48eac945b Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 18 Sep 2018 16:09:15 -0400 Subject: [PATCH 170/184] tests/resource/aws_iam_role_policy_attachment: Parameterize testAccAWSIAMRolePolicyAttachmentImportStateIdFunc() and add simple ImportStateCheck --- ...rce_aws_iam_role_policy_attachment_test.go | 36 ++++++++++++------- 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/aws/resource_aws_iam_role_policy_attachment_test.go b/aws/resource_aws_iam_role_policy_attachment_test.go index 55e03e2a2e6..11c1c66aefe 100644 --- a/aws/resource_aws_iam_role_policy_attachment_test.go +++ b/aws/resource_aws_iam_role_policy_attachment_test.go @@ -34,7 +34,23 @@ func TestAccAWSRolePolicyAttachment_basic(t *testing.T) { { ResourceName: "aws_iam_role_policy_attachment.test-attach", ImportState: true, - ImportStateIdFunc: testAccAWSIAMRolePolicyAttachmentImportStateIdFunc, + ImportStateIdFunc: testAccAWSIAMRolePolicyAttachmentImportStateIdFunc("aws_iam_role_policy_attachment.test-attach"), + // We do not have a way to align IDs since the Create function uses resource.PrefixedUniqueId() + // Failed state verification, resource with ID ROLE-POLICYARN not found + // ImportStateVerify: true, + ImportStateCheck: func(s []*terraform.InstanceState) error { + if len(s) != 1 { + return fmt.Errorf("expected 1 state: %#v", s) + } + + rs := s[0] + + if !strings.HasPrefix(rs.Attributes["policy_arn"], "arn:") { + return fmt.Errorf("expected policy_arn attribute to be set and begin with arn:, received: %s", rs.Attributes["policy_arn"]) + } + + return nil + }, }, { Config: testAccAWSRolePolicyAttachConfigUpdate(rInt), @@ -98,19 +114,15 @@ func testAccCheckAWSRolePolicyAttachmentAttributes(policies []string, out *iam.L } } -func testAccAWSIAMRolePolicyAttachmentImportStateIdFunc(s *terraform.State) (string, error) { - resources := s.RootModule().Resources +func testAccAWSIAMRolePolicyAttachmentImportStateIdFunc(resourceName string) resource.ImportStateIdFunc { + return func(s *terraform.State) (string, error) { + rs, ok := s.RootModule().Resources[resourceName] + if !ok { + return "", fmt.Errorf("Not found: %s", resourceName) + } - roleResource, ok := resources["aws_iam_role.role"] - if !ok { - return "", fmt.Errorf("role not found: aws_iam_role.role") - } - policyResource, ok := resources["aws_iam_policy.policy"] - if !ok { - return "", fmt.Errorf("policy not found: aws_iam_policy.policy") + return fmt.Sprintf("%s/%s", rs.Primary.Attributes["role"], rs.Primary.Attributes["policy_arn"]), nil } - - return fmt.Sprintf("%s/%s", roleResource.Primary.Attributes["name"], policyResource.Primary.Attributes["arn"]), nil } func testAccAWSRolePolicyAttachConfig(rInt int) string { From 70908a67536511b760f090e3062296a29b68088a Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 18 Sep 2018 16:15:51 -0400 Subject: [PATCH 171/184] Update CHANGELOG for #5910 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f73aeab8c67..036470fdb71 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ FEATURES: ENHANCEMENTS: * data-source/aws_ami_ids: Add `sort_ascending` argument [GH-5912] +* resource/aws_iam_role_policy_attachment: Support resource import [GH-5910] * resource/aws_s3_bucket_inventory: Allow SSE-S3 encryption [GH-5870] * resource/aws_security_group: Add `prefix_list_ids` argument for `ingress` rules [GH-5916] From a23fab8db041c7e524d97676dcd63fb0eb74106c Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 18 Sep 2018 16:26:32 -0400 Subject: [PATCH 172/184] Update CHANGELOG for #5902 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 036470fdb71..508e84df111 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ BUG FIXES: * resource/aws_launch_template: Fix handling of `network_interface` `ipv6_addresses` [GH-5883] * resource/aws_s3_bucket: Prevent panics with various API read failures [GH-5842] * resource/aws_s3_bucket: Prevent `NoSuchBucket` error on deletion [GH-5842] +* resource/aws_wafregional_byte_match_set: Properly read `byte_match_tuple` into Terraform state [GH-5902] ## 1.36.0 (September 13, 2018) From c206c9632e668629afa21d94579c671030e92da7 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 18 Sep 2018 20:47:51 -0400 Subject: [PATCH 173/184] Update CHANGELOG for #5895 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 508e84df111..c728d3c9171 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ BUG FIXES: * resource/aws_iam_policy: Ensure `description` is properly read into Terraform state during resource creation [GH-5884] * resource/aws_instance: Properly handle `credit_specifications` with T3 instance types [GH-5805] * resource/aws_launch_template: Fix handling of `network_interface` `ipv6_addresses` [GH-5883] +* resource/aws_redshift_cluster: Properly disable logging when using `logging` nested argument [GH-5895] * resource/aws_s3_bucket: Prevent panics with various API read failures [GH-5842] * resource/aws_s3_bucket: Prevent `NoSuchBucket` error on deletion [GH-5842] * resource/aws_wafregional_byte_match_set: Properly read `byte_match_tuple` into Terraform state [GH-5902] From caa2951c594dd036c32ac621240082e9b9aa5888 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 19 Sep 2018 08:35:40 -0400 Subject: [PATCH 174/184] tests/resource/aws_route_table: Delete Route Table Associations in sweeper Previously it could error with: ``` 2018/09/19 08:23:20 [ERR] error running (aws_vpc): error deleting Route Table (rtb-041caae236ae2745b): DependencyViolation: The routeTable 'rtb-041caae236ae2745b' has dependencies and cannot be deleted. status code: 400, request id: 8d22fa04-ab2c-47b7-b4d3-e7e26a94a02f FAIL github.com/terraform-providers/terraform-provider-aws/aws 58.217s make: *** [sweep] Error 1 ``` Now: ``` 2018/09/19 08:32:28 [DEBUG] Sweeper (aws_vpc) has dependency (aws_route_table), running.. 2018/09/19 08:32:28 [INFO] Building AWS region structure 2018/09/19 08:32:28 [INFO] Building AWS auth structure 2018/09/19 08:32:28 [INFO] Setting AWS metadata API timeout to 100ms 2018/09/19 08:32:28 [INFO] Ignoring AWS metadata API endpoint at default location as it doesn't return any instance-id 2018/09/19 08:32:28 [INFO] AWS Auth provider used: "EnvProvider" 2018/09/19 08:32:28 [INFO] Initializing DeviceFarm SDK connection 2018/09/19 08:32:28 [DEBUG] Trying to get account information via sts:GetCallerIdentity 2018/09/19 08:32:29 [DEBUG] Deleting Route Table Association: { AssociationId: "rtbassoc-0b5b3b2ebdabf1f09" } 2018/09/19 08:32:30 [DEBUG] Deleting Route Table: { RouteTableId: "rtb-041caae236ae2745b" } 2018/09/19 08:32:31 [DEBUG] Deleting Route Table Association: { AssociationId: "rtbassoc-0cb8a623d8235a0c8" } 2018/09/19 08:32:31 [DEBUG] Deleting Route Table: { RouteTableId: "rtb-03bff545e158ebcd0" } 2018/09/19 08:32:32 [DEBUG] Deleting Route Table Association: { AssociationId: "rtbassoc-0072e0aa4bcab4b2b" } 2018/09/19 08:32:32 [DEBUG] Deleting Route Table Association: { AssociationId: "rtbassoc-027ffe6f37fd518a1" } 2018/09/19 08:32:33 [DEBUG] Deleting Route Table: { RouteTableId: "rtb-0d9b64efae987ca8d" } ``` --- aws/resource_aws_route_table_test.go | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/aws/resource_aws_route_table_test.go b/aws/resource_aws_route_table_test.go index 2c4e27dc195..e7ff22053ee 100644 --- a/aws/resource_aws_route_table_test.go +++ b/aws/resource_aws_route_table_test.go @@ -53,6 +53,18 @@ func testSweepRouteTables(region string) error { } for _, routeTable := range resp.RouteTables { + for _, routeTableAssociation := range routeTable.Associations { + input := &ec2.DisassociateRouteTableInput{ + AssociationId: routeTableAssociation.RouteTableAssociationId, + } + + log.Printf("[DEBUG] Deleting Route Table Association: %s", input) + _, err := conn.DisassociateRouteTable(input) + if err != nil { + return fmt.Errorf("error deleting Route Table Association (%s): %s", aws.StringValue(routeTableAssociation.RouteTableAssociationId), err) + } + } + input := &ec2.DeleteRouteTableInput{ RouteTableId: routeTable.RouteTableId, } From 192b6b416b23ab917b408838d775ab9b041a3ccb Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 19 Sep 2018 09:02:24 -0400 Subject: [PATCH 175/184] tests/resource/aws_directory_service_directory: Add sweeper Previously aws_subnet sweeper could fail with: ``` 2018/09/19 08:34:02 [ERR] error running (aws_vpc): Error deleting Subnet (subnet-001e43e8937ffe2e1): DependencyViolation: The subnet 'subnet-001e43e8937ffe2e1' has dependencies and cannot be deleted. status code: 400, request id: 77d7a1f3-fa4a-44d0-ab81-d3e2ce38018b FAIL github.com/terraform-providers/terraform-provider-aws/aws 100.103s make: *** [sweep] Error 1 ``` Now: ``` 2018/09/19 08:43:10 [DEBUG] Sweeper (aws_subnet) has dependency (aws_directory_service_directory), running.. 2018/09/19 08:43:10 [INFO] Building AWS region structure 2018/09/19 08:43:10 [INFO] Building AWS auth structure 2018/09/19 08:43:10 [INFO] Setting AWS metadata API timeout to 100ms 2018/09/19 08:43:10 [INFO] Ignoring AWS metadata API endpoint at default location as it doesn't return any instance-id 2018/09/19 08:43:10 [INFO] AWS Auth provider used: "EnvProvider" 2018/09/19 08:43:10 [INFO] Initializing DeviceFarm SDK connection 2018/09/19 08:43:10 [DEBUG] Trying to get account information via sts:GetCallerIdentity 2018/09/19 08:43:11 [INFO] Deleting Directory Service Directory: { DirectoryId: "d-92672b48f6" } 2018/09/19 08:43:12 [INFO] Waiting for Directory Service Directory ("d-92672b48f6") to be deleted 2018/09/19 08:43:12 [DEBUG] Waiting for state to become: [Deleted] 2018/09/19 08:43:13 [DEBUG] Deletion of Directory Service Directory "d-92672b48f6" is in following stage: "Deleting". ... 2018/09/19 08:48:36 [DEBUG] Deleting VPC: { VpcId: "vpc-0728adc42147189d7" } 2018/09/19 08:48:36 [DEBUG] Waiting for state to become: [success] ``` --- ...esource_aws_directory_service_directory.go | 37 ++++++----- ...ce_aws_directory_service_directory_test.go | 65 +++++++++++++++++++ aws/resource_aws_subnet_test.go | 1 + 3 files changed, 86 insertions(+), 17 deletions(-) diff --git a/aws/resource_aws_directory_service_directory.go b/aws/resource_aws_directory_service_directory.go index 8d4b8eae0e4..bfc54c51b26 100644 --- a/aws/resource_aws_directory_service_directory.go +++ b/aws/resource_aws_directory_service_directory.go @@ -475,14 +475,22 @@ func resourceAwsDirectoryServiceDirectoryDelete(d *schema.ResourceData, meta int DirectoryId: aws.String(d.Id()), } - log.Printf("[DEBUG] Delete Directory input: %s", input) + log.Printf("[DEBUG] Deleting Directory Service Directory: %s", input) _, err := dsconn.DeleteDirectory(&input) if err != nil { - return err + return fmt.Errorf("error deleting Directory Service Directory (%s): %s", d.Id(), err) + } + + log.Printf("[DEBUG] Waiting for Directory Service Directory (%q) to be deleted", d.Id()) + err = waitForDirectoryServiceDirectoryDeletion(dsconn, d.Id(), 60*time.Minute) + if err != nil { + return fmt.Errorf("error waiting for Directory Service (%s) to be deleted: %s", d.Id(), err) } - // Wait for deletion - log.Printf("[DEBUG] Waiting for DS (%q) to be deleted", d.Id()) + return nil +} + +func waitForDirectoryServiceDirectoryDeletion(conn *directoryservice.DirectoryService, directoryID string, timeout time.Duration) error { stateConf := &resource.StateChangeConf{ Pending: []string{ directoryservice.DirectoryStageActive, @@ -490,8 +498,8 @@ func resourceAwsDirectoryServiceDirectoryDelete(d *schema.ResourceData, meta int }, Target: []string{directoryservice.DirectoryStageDeleted}, Refresh: func() (interface{}, string, error) { - resp, err := dsconn.DescribeDirectories(&directoryservice.DescribeDirectoriesInput{ - DirectoryIds: []*string{aws.String(d.Id())}, + resp, err := conn.DescribeDirectories(&directoryservice.DescribeDirectoriesInput{ + DirectoryIds: []*string{aws.String(directoryID)}, }) if err != nil { if isAWSErr(err, directoryservice.ErrCodeEntityDoesNotExistException, "") { @@ -500,22 +508,17 @@ func resourceAwsDirectoryServiceDirectoryDelete(d *schema.ResourceData, meta int return nil, "error", err } - if len(resp.DirectoryDescriptions) == 0 { + if len(resp.DirectoryDescriptions) == 0 || resp.DirectoryDescriptions[0] == nil { return 42, directoryservice.DirectoryStageDeleted, nil } ds := resp.DirectoryDescriptions[0] - log.Printf("[DEBUG] Deletion of DS %q is in following stage: %q.", - d.Id(), *ds.Stage) - return ds, *ds.Stage, nil + log.Printf("[DEBUG] Deletion of Directory Service Directory %q is in following stage: %q.", directoryID, aws.StringValue(ds.Stage)) + return ds, aws.StringValue(ds.Stage), nil }, - Timeout: 60 * time.Minute, - } - if _, err := stateConf.WaitForState(); err != nil { - return fmt.Errorf( - "Error waiting for Directory Service (%s) to be deleted: %q", - d.Id(), err.Error()) + Timeout: timeout, } + _, err := stateConf.WaitForState() - return nil + return err } diff --git a/aws/resource_aws_directory_service_directory_test.go b/aws/resource_aws_directory_service_directory_test.go index d6c782f39cb..8978a0a7444 100644 --- a/aws/resource_aws_directory_service_directory_test.go +++ b/aws/resource_aws_directory_service_directory_test.go @@ -2,8 +2,10 @@ package aws import ( "fmt" + "log" "reflect" "testing" + "time" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/awserr" @@ -14,6 +16,69 @@ import ( "github.com/hashicorp/terraform/terraform" ) +func init() { + resource.AddTestSweepers("aws_directory_service_directory", &resource.Sweeper{ + Name: "aws_directory_service_directory", + F: testSweepDirectoryServiceDirectories, + }) +} + +func testSweepDirectoryServiceDirectories(region string) error { + client, err := sharedClientForRegion(region) + if err != nil { + return fmt.Errorf("error getting client: %s", err) + } + conn := client.(*AWSClient).dsconn + + input := &directoryservice.DescribeDirectoriesInput{} + for { + resp, err := conn.DescribeDirectories(input) + + if testSweepSkipSweepError(err) { + log.Printf("[WARN] Skipping Directory Service Directory sweep for %s: %s", region, err) + return nil + } + + if err != nil { + return fmt.Errorf("error listing Directory Service Directories: %s", err) + } + + for _, directory := range resp.DirectoryDescriptions { + id := aws.StringValue(directory.DirectoryId) + name := aws.StringValue(directory.Name) + + if name != "corp.notexample.com" && name != "terraformtesting.com" { + log.Printf("[INFO] Skipping Directory Service Directory: %s / %s", id, name) + continue + } + + deleteDirectoryInput := directoryservice.DeleteDirectoryInput{ + DirectoryId: directory.DirectoryId, + } + + log.Printf("[INFO] Deleting Directory Service Directory: %s", deleteDirectoryInput) + _, err := conn.DeleteDirectory(&deleteDirectoryInput) + if err != nil { + return fmt.Errorf("error deleting Directory Service Directory (%s): %s", id, err) + } + + log.Printf("[INFO] Waiting for Directory Service Directory (%q) to be deleted", id) + err = waitForDirectoryServiceDirectoryDeletion(conn, id, 60*time.Minute) + if err != nil { + return fmt.Errorf("error waiting for Directory Service (%s) to be deleted: %s", id, err) + } + } + + if resp.NextToken == nil { + break + } + + input.NextToken = resp.NextToken + } + + return nil +} + func TestDiffTagsDirectoryService(t *testing.T) { cases := []struct { Old, New map[string]interface{} diff --git a/aws/resource_aws_subnet_test.go b/aws/resource_aws_subnet_test.go index bf267842c9d..3ddc7167c51 100644 --- a/aws/resource_aws_subnet_test.go +++ b/aws/resource_aws_subnet_test.go @@ -25,6 +25,7 @@ func init() { "aws_batch_compute_environment", "aws_beanstalk_environment", "aws_db_instance", + "aws_directory_service_directory", "aws_eks_cluster", "aws_elasticache_cluster", "aws_elasticache_replication_group", From 9d38cd4c1bad9e7fd40b35df5406a6cc554b80e8 Mon Sep 17 00:00:00 2001 From: tf-release-bot Date: Wed, 19 Sep 2018 19:03:16 +0000 Subject: [PATCH 176/184] v1.37.0 --- CHANGELOG.md | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c728d3c9171..24240602d4c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,26 +1,26 @@ -## 1.37.0 (Unreleased) +## 1.37.0 (September 19, 2018) FEATURES: -* **New Resource:** `aws_dx_bgp_peer` [GH-5886] +* **New Resource:** `aws_dx_bgp_peer` ([#5886](https://github.com/terraform-providers/terraform-provider-aws/issues/5886)) ENHANCEMENTS: -* data-source/aws_ami_ids: Add `sort_ascending` argument [GH-5912] -* resource/aws_iam_role_policy_attachment: Support resource import [GH-5910] -* resource/aws_s3_bucket_inventory: Allow SSE-S3 encryption [GH-5870] -* resource/aws_security_group: Add `prefix_list_ids` argument for `ingress` rules [GH-5916] +* data-source/aws_ami_ids: Add `sort_ascending` argument ([#5912](https://github.com/terraform-providers/terraform-provider-aws/issues/5912)) +* resource/aws_iam_role_policy_attachment: Support resource import ([#5910](https://github.com/terraform-providers/terraform-provider-aws/issues/5910)) +* resource/aws_s3_bucket_inventory: Allow SSE-S3 encryption ([#5870](https://github.com/terraform-providers/terraform-provider-aws/issues/5870)) +* resource/aws_security_group: Add `prefix_list_ids` argument for `ingress` rules ([#5916](https://github.com/terraform-providers/terraform-provider-aws/issues/5916)) BUG FIXES: -* resource/aws_config_config_rule: Prevent panic when specifying empty `scope` [GH-5852] -* resource/aws_iam_policy: Ensure `description` is properly read into Terraform state during resource creation [GH-5884] -* resource/aws_instance: Properly handle `credit_specifications` with T3 instance types [GH-5805] -* resource/aws_launch_template: Fix handling of `network_interface` `ipv6_addresses` [GH-5883] -* resource/aws_redshift_cluster: Properly disable logging when using `logging` nested argument [GH-5895] -* resource/aws_s3_bucket: Prevent panics with various API read failures [GH-5842] -* resource/aws_s3_bucket: Prevent `NoSuchBucket` error on deletion [GH-5842] -* resource/aws_wafregional_byte_match_set: Properly read `byte_match_tuple` into Terraform state [GH-5902] +* resource/aws_config_config_rule: Prevent panic when specifying empty `scope` ([#5852](https://github.com/terraform-providers/terraform-provider-aws/issues/5852)) +* resource/aws_iam_policy: Ensure `description` is properly read into Terraform state during resource creation ([#5884](https://github.com/terraform-providers/terraform-provider-aws/issues/5884)) +* resource/aws_instance: Properly handle `credit_specifications` with T3 instance types ([#5805](https://github.com/terraform-providers/terraform-provider-aws/issues/5805)) +* resource/aws_launch_template: Fix handling of `network_interface` `ipv6_addresses` ([#5883](https://github.com/terraform-providers/terraform-provider-aws/issues/5883)) +* resource/aws_redshift_cluster: Properly disable logging when using `logging` nested argument ([#5895](https://github.com/terraform-providers/terraform-provider-aws/issues/5895)) +* resource/aws_s3_bucket: Prevent panics with various API read failures ([#5842](https://github.com/terraform-providers/terraform-provider-aws/issues/5842)) +* resource/aws_s3_bucket: Prevent `NoSuchBucket` error on deletion ([#5842](https://github.com/terraform-providers/terraform-provider-aws/issues/5842)) +* resource/aws_wafregional_byte_match_set: Properly read `byte_match_tuple` into Terraform state ([#5902](https://github.com/terraform-providers/terraform-provider-aws/issues/5902)) ## 1.36.0 (September 13, 2018) From 195e00fb7a1c621e76ce983bd8addf4192067f2e Mon Sep 17 00:00:00 2001 From: tf-release-bot Date: Wed, 19 Sep 2018 19:11:39 +0000 Subject: [PATCH 177/184] Cleanup after v1.37.0 release --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 24240602d4c..aa5161face3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,4 @@ +## 1.38.0 (Unreleased) ## 1.37.0 (September 19, 2018) FEATURES: From 0536b7366d75bef9db0b6a4cfc5af6825e08f383 Mon Sep 17 00:00:00 2001 From: Marco Reni Date: Wed, 19 Sep 2018 23:44:22 +0200 Subject: [PATCH 178/184] aws_codebuild_project: Support secondary_artifacts and secondary_sources --- aws/resource_aws_codebuild_project.go | 296 ++++++++++++++++-- aws/resource_aws_codebuild_project_test.go | 120 +++++++ .../docs/r/codebuild_project.html.markdown | 26 ++ 3 files changed, 409 insertions(+), 33 deletions(-) diff --git a/aws/resource_aws_codebuild_project.go b/aws/resource_aws_codebuild_project.go index 94fb9e43b7f..ebe7568b7c7 100644 --- a/aws/resource_aws_codebuild_project.go +++ b/aws/resource_aws_codebuild_project.go @@ -183,6 +183,123 @@ func resourceAwsCodeBuildProject() *schema.Resource { ForceNew: true, ValidateFunc: validateAwsCodeBuildProjectName, }, + "secondary_artifacts": { + Type: schema.TypeSet, + Optional: true, + Set: resourceAwsCodeBuildProjectArtifactsHash, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "name": { + Type: schema.TypeString, + Optional: true, + }, + "encryption_disabled": { + Type: schema.TypeBool, + Optional: true, + Default: false, + }, + "location": { + Type: schema.TypeString, + Optional: true, + }, + "namespace_type": { + Type: schema.TypeString, + Optional: true, + ValidateFunc: validation.StringInSlice([]string{ + codebuild.ArtifactNamespaceNone, + codebuild.ArtifactNamespaceBuildId, + }, false), + }, + "packaging": { + Type: schema.TypeString, + Optional: true, + }, + "path": { + Type: schema.TypeString, + Optional: true, + }, + "artifact_identifier": { + Type: schema.TypeString, + Required: true, + }, + "type": { + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.StringInSlice([]string{ + codebuild.ArtifactsTypeCodepipeline, + codebuild.ArtifactsTypeS3, + codebuild.ArtifactsTypeNoArtifacts, + }, false), + }, + }, + }, + }, + "secondary_sources": { + Type: schema.TypeSet, + Optional: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "auth": { + Type: schema.TypeSet, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "resource": { + Type: schema.TypeString, + Sensitive: true, + Optional: true, + }, + "type": { + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.StringInSlice([]string{ + codebuild.SourceAuthTypeOauth, + }, false), + }, + }, + }, + Optional: true, + Set: resourceAwsCodeBuildProjectSourceAuthHash, + }, + "buildspec": { + Type: schema.TypeString, + Optional: true, + }, + "location": { + Type: schema.TypeString, + Optional: true, + }, + "type": { + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.StringInSlice([]string{ + codebuild.SourceTypeCodecommit, + codebuild.SourceTypeCodepipeline, + codebuild.SourceTypeGithub, + codebuild.SourceTypeS3, + codebuild.SourceTypeBitbucket, + codebuild.SourceTypeGithubEnterprise, + }, false), + }, + "git_clone_depth": { + Type: schema.TypeInt, + Optional: true, + ValidateFunc: validation.IntAtLeast(0), + }, + "insecure_ssl": { + Type: schema.TypeBool, + Optional: true, + }, + "report_build_status": { + Type: schema.TypeBool, + Optional: true, + }, + "source_identifier": { + Type: schema.TypeString, + Required: true, + }, + }, + }, + }, "service_role": { Type: schema.TypeString, Required: true, @@ -324,12 +441,16 @@ func resourceAwsCodeBuildProjectCreate(d *schema.ResourceData, meta interface{}) projectEnv := expandProjectEnvironment(d) projectSource := expandProjectSource(d) projectArtifacts := expandProjectArtifacts(d) + projectSecondaryArtifacts := expandProjectSecondaryArtifacts(d) + projectSecondarySources := expandProjectSecondarySources(d) params := &codebuild.CreateProjectInput{ - Environment: projectEnv, - Name: aws.String(d.Get("name").(string)), - Source: &projectSource, - Artifacts: &projectArtifacts, + Environment: projectEnv, + Name: aws.String(d.Get("name").(string)), + Source: &projectSource, + Artifacts: &projectArtifacts, + SecondaryArtifacts: projectSecondaryArtifacts, + SecondarySources: projectSecondarySources, } if v, ok := d.GetOk("cache"); ok { @@ -393,10 +514,31 @@ func resourceAwsCodeBuildProjectCreate(d *schema.ResourceData, meta interface{}) return resourceAwsCodeBuildProjectRead(d, meta) } +func expandProjectSecondaryArtifacts(d *schema.ResourceData) []*codebuild.ProjectArtifacts { + artifacts := make([]*codebuild.ProjectArtifacts, 0) + + configsList := d.Get("secondary_artifacts").(*schema.Set).List() + + if len(configsList) == 0 { + return nil + } + + for _, config := range configsList { + art := expandProjectArtifactData(config.(map[string]interface{})) + artifacts = append(artifacts, &art) + } + + return artifacts +} + func expandProjectArtifacts(d *schema.ResourceData) codebuild.ProjectArtifacts { configs := d.Get("artifacts").(*schema.Set).List() data := configs[0].(map[string]interface{}) + return expandProjectArtifactData(data) +} + +func expandProjectArtifactData(data map[string]interface{}) codebuild.ProjectArtifacts { artifactType := data["type"].(string) projectArtifacts := codebuild.ProjectArtifacts{ @@ -409,6 +551,10 @@ func expandProjectArtifacts(d *schema.ResourceData) codebuild.ProjectArtifacts { projectArtifacts.EncryptionDisabled = aws.Bool(data["encryption_disabled"].(bool)) } + if data["artifact_identifier"] != nil && data["artifact_identifier"].(string) != "" { + projectArtifacts.ArtifactIdentifier = aws.String(data["artifact_identifier"].(string)) + } + if data["location"].(string) != "" { projectArtifacts.Location = aws.String(data["location"].(string)) } @@ -515,37 +661,58 @@ func expandCodeBuildVpcConfig(rawVpcConfig []interface{}) *codebuild.VpcConfig { return &vpcConfig } +func expandProjectSecondarySources(d *schema.ResourceData) []*codebuild.ProjectSource { + configs := d.Get("secondary_sources").(*schema.Set).List() + + if len(configs) == 0 { + return nil + } + + sources := make([]*codebuild.ProjectSource, 0) + + for _, config := range configs { + source := expandProjectSourceData(config.(map[string]interface{})) + sources = append(sources, &source) + } + + return sources +} + func expandProjectSource(d *schema.ResourceData) codebuild.ProjectSource { configs := d.Get("source").(*schema.Set).List() - projectSource := codebuild.ProjectSource{} - for _, configRaw := range configs { - data := configRaw.(map[string]interface{}) + data := configs[0].(map[string]interface{}) + return expandProjectSourceData(data) +} - sourceType := data["type"].(string) +func expandProjectSourceData(data map[string]interface{}) codebuild.ProjectSource { + sourceType := data["type"].(string) - projectSource = codebuild.ProjectSource{ - Buildspec: aws.String(data["buildspec"].(string)), - GitCloneDepth: aws.Int64(int64(data["git_clone_depth"].(int))), - InsecureSsl: aws.Bool(data["insecure_ssl"].(bool)), - Location: aws.String(data["location"].(string)), - Type: aws.String(sourceType), - } + projectSource := codebuild.ProjectSource{ + Buildspec: aws.String(data["buildspec"].(string)), + GitCloneDepth: aws.Int64(int64(data["git_clone_depth"].(int))), + InsecureSsl: aws.Bool(data["insecure_ssl"].(bool)), + Location: aws.String(data["location"].(string)), + Type: aws.String(sourceType), + } - // Only valid for GITHUB source type, e.g. - // InvalidInputException: Source type GITHUB_ENTERPRISE does not support ReportBuildStatus - if sourceType == codebuild.SourceTypeGithub { - projectSource.ReportBuildStatus = aws.Bool(data["report_build_status"].(bool)) - } + if data["source_identifier"] != nil { + projectSource.SourceIdentifier = aws.String(data["source_identifier"].(string)) + } - if v, ok := data["auth"]; ok { - if len(v.(*schema.Set).List()) > 0 { - auth := v.(*schema.Set).List()[0].(map[string]interface{}) + // Only valid for GITHUB source type, e.g. + // InvalidInputException: Source type GITHUB_ENTERPRISE does not support ReportBuildStatus + if sourceType == codebuild.SourceTypeGithub { + projectSource.ReportBuildStatus = aws.Bool(data["report_build_status"].(bool)) + } - projectSource.Auth = &codebuild.SourceAuth{ - Type: aws.String(auth["type"].(string)), - Resource: aws.String(auth["resource"].(string)), - } + if v, ok := data["auth"]; ok { + if len(v.(*schema.Set).List()) > 0 { + auth := v.(*schema.Set).List()[0].(map[string]interface{}) + + projectSource.Auth = &codebuild.SourceAuth{ + Type: aws.String(auth["type"].(string)), + Resource: aws.String(auth["resource"].(string)), } } } @@ -587,6 +754,14 @@ func resourceAwsCodeBuildProjectRead(d *schema.ResourceData, meta interface{}) e return err } + if err := d.Set("secondary_artifacts", flattenAwsCodeBuildProjectSecondaryArtifacts(project.SecondaryArtifacts)); err != nil { + return err + } + + if err := d.Set("secondary_sources", flattenAwsCodeBuildProjectSecondarySources(project.SecondarySources)); err != nil { + return err + } + if err := d.Set("source", flattenAwsCodeBuildProjectSource(project.Source)); err != nil { return err } @@ -637,6 +812,16 @@ func resourceAwsCodeBuildProjectUpdate(d *schema.ResourceData, meta interface{}) params.Artifacts = &projectArtifacts } + if d.HasChange("secondary_sources") { + projectSecondarySources := expandProjectSecondarySources(d) + params.SecondarySources = projectSecondarySources + } + + if d.HasChange("secondary_artifacts") { + projectSecondaryArtifacts := expandProjectSecondaryArtifacts(d) + params.SecondaryArtifacts = projectSecondaryArtifacts + } + if d.HasChange("vpc_config") { params.VpcConfig = expandCodeBuildVpcConfig(d.Get("vpc_config").([]interface{})) } @@ -717,16 +902,39 @@ func resourceAwsCodeBuildProjectDelete(d *schema.ResourceData, meta interface{}) return nil } +func flattenAwsCodeBuildProjectSecondaryArtifacts(artifactsList []*codebuild.ProjectArtifacts) *schema.Set { + artifactSet := schema.Set{ + F: resourceAwsCodeBuildProjectArtifactsHash, + } + + for _, artifacts := range artifactsList { + artifactSet.Add(flattenAwsCodeBuildProjectArtifactsData(*artifacts)) + } + return &artifactSet +} + func flattenAwsCodeBuildProjectArtifacts(artifacts *codebuild.ProjectArtifacts) *schema.Set { artifactSet := schema.Set{ F: resourceAwsCodeBuildProjectArtifactsHash, } + values := flattenAwsCodeBuildProjectArtifactsData(*artifacts) + + artifactSet.Add(values) + + return &artifactSet +} + +func flattenAwsCodeBuildProjectArtifactsData(artifacts codebuild.ProjectArtifacts) map[string]interface{} { values := map[string]interface{}{} values["type"] = *artifacts.Type + if artifacts.ArtifactIdentifier != nil { + values["artifact_identifier"] = *artifacts.ArtifactIdentifier + } + if artifacts.EncryptionDisabled != nil { values["encryption_disabled"] = *artifacts.EncryptionDisabled } @@ -749,10 +957,7 @@ func flattenAwsCodeBuildProjectArtifacts(artifacts *codebuild.ProjectArtifacts) if artifacts.Path != nil { values["path"] = *artifacts.Path } - - artifactSet.Add(values) - - return &artifactSet + return values } func flattenAwsCodebuildProjectCache(cache *codebuild.ProjectCache) []interface{} { @@ -784,8 +989,25 @@ func flattenAwsCodeBuildProjectEnvironment(environment *codebuild.ProjectEnviron } +func flattenAwsCodeBuildProjectSecondarySources(sourceList []*codebuild.ProjectSource) []interface{} { + l := make([]interface{}, 0) + + for _, source := range sourceList { + l = append(l, flattenAwsCodeBuildProjectSourceData(source)) + } + + return l +} + func flattenAwsCodeBuildProjectSource(source *codebuild.ProjectSource) []interface{} { l := make([]interface{}, 1) + + l[0] = flattenAwsCodeBuildProjectSourceData(source) + + return l +} + +func flattenAwsCodeBuildProjectSourceData(source *codebuild.ProjectSource) interface{} { m := map[string]interface{}{ "buildspec": aws.StringValue(source.Buildspec), "location": aws.StringValue(source.Location), @@ -799,9 +1021,11 @@ func flattenAwsCodeBuildProjectSource(source *codebuild.ProjectSource) []interfa m["auth"] = schema.NewSet(resourceAwsCodeBuildProjectSourceAuthHash, []interface{}{sourceAuthToMap(source.Auth)}) } - l[0] = m + if source.SourceIdentifier != nil { + m["source_identifier"] = aws.StringValue(source.SourceIdentifier) + } - return l + return m } func flattenAwsCodeBuildVpcConfig(vpcConfig *codebuild.VpcConfig) []interface{} { @@ -823,6 +1047,9 @@ func resourceAwsCodeBuildProjectArtifactsHash(v interface{}) int { buf.WriteString(fmt.Sprintf("%s-", m["type"].(string))) + if v, ok := m["artifact_identifier"]; ok { + buf.WriteString(fmt.Sprintf("%s:", v.(string))) + } return hashcode.String(buf.String()) } @@ -859,6 +1086,9 @@ func resourceAwsCodeBuildProjectSourceHash(v interface{}) int { m := v.(map[string]interface{}) buf.WriteString(fmt.Sprintf("%s-", m["type"].(string))) + if v, ok := m["source_identifier"]; ok { + buf.WriteString(fmt.Sprintf("%s-", strconv.Itoa(v.(int)))) + } if v, ok := m["buildspec"]; ok { buf.WriteString(fmt.Sprintf("%s-", v.(string))) } diff --git a/aws/resource_aws_codebuild_project_test.go b/aws/resource_aws_codebuild_project_test.go index 201c608b167..e026d98c5c0 100644 --- a/aws/resource_aws_codebuild_project_test.go +++ b/aws/resource_aws_codebuild_project_test.go @@ -623,6 +623,53 @@ func TestAccAWSCodeBuildProject_Artifacts_EncryptionDisabled(t *testing.T) { }) } +func TestAccAWSCodeBuildProject_SecondaryArtifacts(t *testing.T) { + var project codebuild.Project + rName := acctest.RandomWithPrefix("tf-acc-test") + bName := acctest.RandomWithPrefix("tf-acc-test-bucket") + resourceName := "aws_codebuild_project.test" + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSCodeBuildProjectDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSCodebuildProjectConfig_SecondaryArtifacts(rName, bName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSCodeBuildProjectExists(resourceName, &project), + resource.TestCheckResourceAttr(resourceName, "secondary_artifacts.#", "2"), + resource.TestCheckResourceAttr(resourceName, "secondary_artifacts.2341549664.artifact_identifier", "secondaryArtifact1"), + resource.TestCheckResourceAttr(resourceName, "secondary_artifacts.2696701347.artifact_identifier", "secondaryArtifact2"), + ), + }, + }, + }) +} + +func TestAccAWSCodeBuildProject_SecondarySources_CodeCommit(t *testing.T) { + var project codebuild.Project + rName := acctest.RandomWithPrefix("tf-acc-test") + resourceName := "aws_codebuild_project.test" + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSCodeBuildProjectDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSCodeBuildProjectConfig_SecondarySources_CodeCommit(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSCodeBuildProjectExists(resourceName, &project), + resource.TestCheckResourceAttr(resourceName, "source.3715340088.type", "CODECOMMIT"), + resource.TestCheckResourceAttr(resourceName, "secondary_sources.3525046785.source_identifier", "secondarySource1"), + resource.TestCheckResourceAttr(resourceName, "secondary_sources.2644986630.source_identifier", "secondarySource2"), + ), + }, + }, + }) +} + func TestAWSCodeBuildProject_nameValidation(t *testing.T) { cases := []struct { Value string @@ -1319,3 +1366,76 @@ resource "aws_codebuild_project" "test" { } `, rName, encryptionDisabled) } + +func testAccAWSCodebuildProjectConfig_SecondaryArtifacts(rName string, bName string) string { + return testAccAWSCodeBuildProjectConfig_Base_ServiceRole(rName) + testAccAWSCodeBuildProjectConfig_Base_Bucket(bName) + fmt.Sprintf(` +resource "aws_codebuild_project" "test" { + name = "%s" + service_role = "${aws_iam_role.test.arn}" + + artifacts { + location = "${aws_s3_bucket.test.bucket}" + type = "S3" + } + + secondary_artifacts { + artifact_identifier = "secondaryArtifact1" + location = "${aws_s3_bucket.test.bucket}" + type = "S3" + } + + secondary_artifacts { + artifact_identifier = "secondaryArtifact2" + location = "${aws_s3_bucket.test.bucket}" + type = "S3" + } + + environment { + compute_type = "BUILD_GENERAL1_SMALL" + image = "2" + type = "LINUX_CONTAINER" + } + + source { + type = "GITHUB" + location = "https://github.com/hashicorp/packer.git" + } +} +`, rName) +} + +func testAccAWSCodeBuildProjectConfig_SecondarySources_CodeCommit(rName string) string { + return testAccAWSCodeBuildProjectConfig_Base_ServiceRole(rName) + fmt.Sprintf(` +resource "aws_codebuild_project" "test" { + name = %q + service_role = "${aws_iam_role.test.arn}" + + artifacts { + type = "NO_ARTIFACTS" + } + + environment { + compute_type = "BUILD_GENERAL1_SMALL" + image = "2" + type = "LINUX_CONTAINER" + } + + source { + location = "https://git-codecommit.region-id.amazonaws.com/v1/repos/repo-name" + type = "CODECOMMIT" + } + + secondary_sources { + location = "https://git-codecommit.region-id.amazonaws.com/v1/repos/second-repo-name" + type = "CODECOMMIT" + source_identifier = "secondarySource1" + } + + secondary_sources { + location = "https://git-codecommit.region-id.amazonaws.com/v1/repos/third-repo-name" + type = "CODECOMMIT" + source_identifier = "secondarySource2" + } +} +`, rName) +} diff --git a/website/docs/r/codebuild_project.html.markdown b/website/docs/r/codebuild_project.html.markdown index 69cf7a3325e..3e672e6459e 100644 --- a/website/docs/r/codebuild_project.html.markdown +++ b/website/docs/r/codebuild_project.html.markdown @@ -157,6 +157,8 @@ The following arguments are supported: * `service_role` - (Required) The Amazon Resource Name (ARN) of the AWS Identity and Access Management (IAM) role that enables AWS CodeBuild to interact with dependent AWS services on behalf of the AWS account. * `tags` - (Optional) A mapping of tags to assign to the resource. * `vpc_config` - (Optional) Configuration for the builds to run inside a VPC. VPC config blocks are documented below. +* `secondary_artifacts` - (Optional) A set of secondary artifacts to be used inside the build. Secondary artifacts blocks are documented below. +* `secondary_sources` - (Optional) A set of secondary sources to be used inside the build. Secondary sources blocks are documented below. `artifacts` supports the following: @@ -208,6 +210,30 @@ The following arguments are supported: * `subnets` - (Required) The subnet IDs within which to run builds. * `vpc_id` - (Required) The ID of the VPC within which to run builds. + +`secondary_artifacts` supports the following: + +* `type` - (Required) The build output artifact's type. Valid values for this parameter are: `CODEPIPELINE`, `NO_ARTIFACTS` or `S3`. +* `artifact_identifier` - (Required) The artifact identifier. Must be the same specified inside AWS CodeBuild buildspec. +* `encryption_disabled` - (Optional) If set to true, output artifacts will not be encrypted. If `type` is set to `NO_ARTIFACTS` then this value will be ignored. Defaults to `false`. +* `location` - (Optional) Information about the build output artifact location. If `type` is set to `CODEPIPELINE` or `NO_ARTIFACTS` then this value will be ignored. If `type` is set to `S3`, this is the name of the output bucket. If `path` is not also specified, then `location` can also specify the path of the output artifact in the output bucket. +* `name` - (Optional) The name of the project. If `type` is set to `S3`, this is the name of the output artifact object +* `namespace_type` - (Optional) The namespace to use in storing build artifacts. If `type` is set to `S3`, then valid values for this parameter are: `BUILD_ID` or `NONE`. +* `packaging` - (Optional) The type of build output artifact to create. If `type` is set to `S3`, valid values for this parameter are: `NONE` or `ZIP` +* `path` - (Optional) If `type` is set to `S3`, this is the path to the output artifact + +`secondary_sources` supports the following: + +* `type` - (Required) The type of repository that contains the source code to be built. Valid values for this parameter are: `CODECOMMIT`, `CODEPIPELINE`, `GITHUB`, `GITHUB_ENTERPRISE`, `BITBUCKET` or `S3`. +* `source_identifier` - (Required) The source identifier. Source data will be put inside a folder named as this parameter inside AWS CodeBuild source directory +* `auth` - (Optional) Information about the authorization settings for AWS CodeBuild to access the source code to be built. Auth blocks are documented below. +* `buildspec` - (Optional) The build spec declaration to use for this build project's related builds. +* `git_clone_depth` - (Optional) Truncate git history to this many commits. +* `insecure_ssl` - (Optional) Ignore SSL warnings when connecting to source control. +* `location` - (Optional) The location of the source code from git or s3. +* `report_build_status` - (Optional) Set to `true` to report the status of a build's start and finish to your source provider. This option is only valid when your source provider is GitHub. + + ## Attributes Reference In addition to all arguments above, the following attributes are exported: From ac67385b009b635b1abbb2373c3240b1cf25629d Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 19 Sep 2018 20:15:54 -0400 Subject: [PATCH 179/184] Update CHANGELOG for #5922 --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index aa5161face3..2c80aabce1a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,9 @@ ## 1.38.0 (Unreleased) + +ENHANCEMENTS: + +* resource/aws_launch_template: Support `credit_specification` configuration of T3 instance types [GH-5922] + ## 1.37.0 (September 19, 2018) FEATURES: From 04e8d586d8ff44933eff627a288c68178ea85258 Mon Sep 17 00:00:00 2001 From: sioncojp Date: Thu, 20 Sep 2018 12:00:38 +0900 Subject: [PATCH 180/184] Make use of NewSession() because Session() is deprecated --- aws/resource_aws_instance_test.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/aws/resource_aws_instance_test.go b/aws/resource_aws_instance_test.go index fab4046f755..a32328e067d 100644 --- a/aws/resource_aws_instance_test.go +++ b/aws/resource_aws_instance_test.go @@ -115,7 +115,12 @@ func TestFetchRootDevice(t *testing.T) { }, } - conn := ec2.New(session.New(nil)) + sess, err := session.NewSession(nil) + if err != nil { + t.Errorf("Error new session: %s", err) + } + + conn := ec2.New(sess) for _, tc := range cases { t.Run(fmt.Sprintf(tc.label), func(t *testing.T) { From 322e130da0841c320678bef95393bd7fc43e4a53 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Thu, 20 Sep 2018 00:05:37 -0400 Subject: [PATCH 181/184] vendor: aws/aws-sdk-go@v1.15.38 Updated via: * `govendor fetch github.com/aws/aws-sdk-go/...@v1.15.38` --- .../github.com/aws/aws-sdk-go/aws/version.go | 2 +- .../aws/aws-sdk-go/service/cloudwatch/api.go | 356 ++- .../aws/aws-sdk-go/service/codebuild/api.go | 268 ++- .../aws/aws-sdk-go/service/ec2/api.go | 387 ++-- .../aws/aws-sdk-go/service/ecs/api.go | 178 +- .../aws/aws-sdk-go/service/elasticache/api.go | 970 +++++++-- .../aws-sdk-go/service/elasticache/errors.go | 14 + .../service/elasticsearchservice/api.go | 91 + .../service/elastictranscoder/api.go | 34 +- .../aws/aws-sdk-go/service/fms/api.go | 288 ++- .../aws/aws-sdk-go/service/fms/errors.go | 6 + .../aws-sdk-go/service/organizations/api.go | 1934 +++++++++-------- .../service/organizations/errors.go | 148 +- .../aws/aws-sdk-go/service/s3/api.go | 264 ++- .../aws-sdk-go/service/secretsmanager/api.go | 22 +- .../aws/aws-sdk-go/service/ses/api.go | 137 +- vendor/vendor.json | 1042 ++++----- 17 files changed, 4106 insertions(+), 2035 deletions(-) diff --git a/vendor/github.com/aws/aws-sdk-go/aws/version.go b/vendor/github.com/aws/aws-sdk-go/aws/version.go index f98a90c797b..817d3c2aa12 100644 --- a/vendor/github.com/aws/aws-sdk-go/aws/version.go +++ b/vendor/github.com/aws/aws-sdk-go/aws/version.go @@ -5,4 +5,4 @@ package aws const SDKName = "aws-sdk-go" // SDKVersion is the version of this SDK -const SDKVersion = "1.15.33" +const SDKVersion = "1.15.38" diff --git a/vendor/github.com/aws/aws-sdk-go/service/cloudwatch/api.go b/vendor/github.com/aws/aws-sdk-go/service/cloudwatch/api.go index 135c56d8976..773336a7352 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/cloudwatch/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/cloudwatch/api.go @@ -830,6 +830,29 @@ func (c *CloudWatch) GetMetricDataRequest(input *GetMetricDataInput) (req *reque // to GetMetricStatistics. For more information about pricing, see Amazon CloudWatch // Pricing (https://aws.amazon.com/cloudwatch/pricing/). // +// Amazon CloudWatch retains metric data as follows: +// +// * Data points with a period of less than 60 seconds are available for +// 3 hours. These data points are high-resolution metrics and are available +// only for custom metrics that have been defined with a StorageResolution +// of 1. +// +// * Data points with a period of 60 seconds (1-minute) are available for +// 15 days. +// +// * Data points with a period of 300 seconds (5-minute) are available for +// 63 days. +// +// * Data points with a period of 3600 seconds (1 hour) are available for +// 455 days (15 months). +// +// Data points that are initially published with a shorter period are aggregated +// together for long-term storage. For example, if you collect data using a +// period of 1 minute, the data remains available for 15 days with 1-minute +// resolution. After 15 days, this data is still available, but is aggregated +// and retrievable only with a resolution of 5 minutes. After 63 days, the data +// is further aggregated and is available with a resolution of 1 hour. +// // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about // the error. @@ -929,6 +952,9 @@ func (c *CloudWatch) GetMetricStatisticsRequest(input *GetMetricStatisticsInput) // // * The Min and the Max values of the statistic set are equal. // +// Percentile statistics are not available for metrics when any of the metric +// values are negative numbers. +// // Amazon CloudWatch retains metric data as follows: // // * Data points with a period of less than 60 seconds are available for @@ -1001,6 +1027,94 @@ func (c *CloudWatch) GetMetricStatisticsWithContext(ctx aws.Context, input *GetM return out, req.Send() } +const opGetMetricWidgetImage = "GetMetricWidgetImage" + +// GetMetricWidgetImageRequest generates a "aws/request.Request" representing the +// client's request for the GetMetricWidgetImage operation. The "output" return +// value will be populated with the request's response once the request completes +// successfuly. +// +// Use "Send" method on the returned Request to send the API call to the service. +// the "output" return value is not valid until after Send returns without error. +// +// See GetMetricWidgetImage for more information on using the GetMetricWidgetImage +// API call, and error handling. +// +// This method is useful when you want to inject custom logic or configuration +// into the SDK's request lifecycle. Such as custom headers, or retry logic. +// +// +// // Example sending a request using the GetMetricWidgetImageRequest method. +// req, resp := client.GetMetricWidgetImageRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/monitoring-2010-08-01/GetMetricWidgetImage +func (c *CloudWatch) GetMetricWidgetImageRequest(input *GetMetricWidgetImageInput) (req *request.Request, output *GetMetricWidgetImageOutput) { + op := &request.Operation{ + Name: opGetMetricWidgetImage, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &GetMetricWidgetImageInput{} + } + + output = &GetMetricWidgetImageOutput{} + req = c.newRequest(op, input, output) + return +} + +// GetMetricWidgetImage API operation for Amazon CloudWatch. +// +// You can use the GetMetricWidgetImage API to retrieve a snapshot graph of +// one or more Amazon CloudWatch metrics as a bitmap image. You can then embed +// this image into your services and products, such as wiki pages, reports, +// and documents. You could also retrieve images regularly, such as every minute, +// and create your own custom live dashboard. +// +// The graph you retrieve can include all CloudWatch metric graph features, +// including metric math and horizontal and vertical annotations. +// +// There is a limit of 20 transactions per second for this API. Each GetMetricWidgetImage +// action has the following limits: +// +// * As many as 100 metrics in the graph. +// +// * Up to 100 KB uncompressed payload. +// +// Returns awserr.Error for service API and SDK errors. Use runtime type assertions +// with awserr.Error's Code and Message methods to get detailed information about +// the error. +// +// See the AWS API reference guide for Amazon CloudWatch's +// API operation GetMetricWidgetImage for usage and error information. +// See also, https://docs.aws.amazon.com/goto/WebAPI/monitoring-2010-08-01/GetMetricWidgetImage +func (c *CloudWatch) GetMetricWidgetImage(input *GetMetricWidgetImageInput) (*GetMetricWidgetImageOutput, error) { + req, out := c.GetMetricWidgetImageRequest(input) + return out, req.Send() +} + +// GetMetricWidgetImageWithContext is the same as GetMetricWidgetImage with the addition of +// the ability to pass a context and additional request options. +// +// See GetMetricWidgetImage for details on how to use this API operation. +// +// The context must be non-nil and will be used for request cancellation. If +// the context is nil a panic will occur. In the future the SDK may create +// sub-contexts for http.Requests. See https://golang.org/pkg/context/ +// for more information on using Contexts. +func (c *CloudWatch) GetMetricWidgetImageWithContext(ctx aws.Context, input *GetMetricWidgetImageInput, opts ...request.Option) (*GetMetricWidgetImageOutput, error) { + req, out := c.GetMetricWidgetImageRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opListDashboards = "ListDashboards" // ListDashboardsRequest generates a "aws/request.Request" representing the @@ -1049,6 +1163,10 @@ func (c *CloudWatch) ListDashboardsRequest(input *ListDashboardsInput) (req *req // only those dashboards with names starting with the prefix are listed. Otherwise, // all dashboards in your account are listed. // +// ListDashboards returns up to 1000 results on one page. If there are more +// than 1000 dashboards, you can call ListDashboards again and include the value +// you received for NextToken in the first call, to receive the next 1000 results. +// // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about // the error. @@ -1135,15 +1253,15 @@ func (c *CloudWatch) ListMetricsRequest(input *ListMetricsInput) (req *request.R // ListMetrics API operation for Amazon CloudWatch. // -// List the specified metrics. You can use the returned metrics with GetMetricStatistics -// to obtain statistical data. +// List the specified metrics. You can use the returned metrics with GetMetricData +// or GetMetricStatistics to obtain statistical data. // // Up to 500 results are returned for any one call. To retrieve additional results, // use the returned token with subsequent calls. // // After you create a metric, allow up to fifteen minutes before the metric // appears. Statistics about the metric, however, are available sooner using -// GetMetricStatistics. +// GetMetricData or GetMetricStatistics. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about @@ -1279,8 +1397,8 @@ func (c *CloudWatch) PutDashboardRequest(input *PutDashboardInput) (req *request // dashboard. If you update a dashboard, the entire contents are replaced with // what you specify here. // -// You can have up to 500 dashboards per account. All dashboards in your account -// are global, not region-specific. +// There is no limit to the number of dashboards in your account. All dashboards +// in your account are global, not region-specific. // // A simple way to create a dashboard using PutDashboard is to copy an existing // dashboard. To copy an existing dashboard using the console, you can load @@ -1415,10 +1533,11 @@ func (c *CloudWatch) PutMetricAlarmRequest(input *PutMetricAlarmInput) (req *req // If you are using temporary security credentials granted using AWS STS, you // cannot stop or terminate an EC2 instance using alarm actions. // -// You must create at least one stop, terminate, or reboot alarm using either -// the Amazon EC2 or CloudWatch consoles to create the EC2ActionsAccess IAM -// role. After this IAM role is created, you can create stop, terminate, or -// reboot alarms using a command-line interface or API. +// The first time you create an alarm in the AWS Management Console, the CLI, +// or by using the PutMetricAlarm API, CloudWatch creates the necessary service-linked +// role for you. The service-linked role is called AWSServiceRoleForCloudWatchEvents. +// For more information about service-linked roles, see AWS service-linked role +// (http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_terms-and-concepts.html#iam-term-service-linked-role). // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about @@ -1499,12 +1618,21 @@ func (c *CloudWatch) PutMetricDataRequest(input *PutMetricDataInput) (req *reque // PutMetricData API operation for Amazon CloudWatch. // -// Publishes metric data points to Amazon CloudWatch. CloudWatch associates -// the data points with the specified metric. If the specified metric does not -// exist, CloudWatch creates the metric. When CloudWatch creates a metric, it -// can take up to fifteen minutes for the metric to appear in calls to ListMetrics. +// Publishes metric data to Amazon CloudWatch. CloudWatch associates the data +// with the specified metric. If the specified metric does not exist, CloudWatch +// creates the metric. When CloudWatch creates a metric, it can take up to fifteen +// minutes for the metric to appear in calls to ListMetrics. +// +// You can publish either individual data points in the Value field, or arrays +// of values and the number of times each value occurred during the period by +// using the Values and Counts fields in the MetricDatum structure. Using the +// Values and Counts method enables you to publish up to 150 values per metric +// with one PutMetricData request, and supports retrieving percentile statistics +// on this data. // // Each PutMetricData request is limited to 40 KB in size for HTTP POST requests. +// You can send a payload compressed by gzip. Each request is also limited to +// no more than 20 different metrics. // // Although the Value parameter accepts numbers of type Double, CloudWatch rejects // values that are either too small or too large. Values must be in the range @@ -1518,16 +1646,19 @@ func (c *CloudWatch) PutMetricDataRequest(input *PutMetricDataInput) (req *reque // in the Amazon CloudWatch User Guide. // // Data points with time stamps from 24 hours ago or longer can take at least -// 48 hours to become available for GetMetricStatistics from the time they are -// submitted. +// 48 hours to become available for GetMetricData or GetMetricStatistics from +// the time they are submitted. // -// CloudWatch needs raw data points to calculate percentile statistics. If you -// publish data using a statistic set instead, you can only retrieve percentile -// statistics for this data if one of the following conditions is true: +// CloudWatch needs raw data points to calculate percentile statistics. These +// raw data points could be published individually or as part of Values and +// Counts arrays. If you publish data using statistic sets in the StatisticValues +// field instead, you can only retrieve percentile statistics for this data +// if one of the following conditions is true: // -// * The SampleCount value of the statistic set is 1 +// * The SampleCount value of the statistic set is 1 and Min, Max, and Sum +// are all equal. // -// * The Min and the Max values of the statistic set are equal +// * The Min and Max are equal, and Sum is equal to Min multiplied by SampleCount. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about @@ -2683,6 +2814,12 @@ type GetMetricDataInput struct { // The time stamp indicating the latest data to be returned. // + // For better performance, specify StartTime and EndTime values that align with + // the value of the metric's Period and sync up with the beginning and end of + // an hour. For example, if the Period of a metric is 5 minutes, specifying + // 12:05 or 12:30 as EndTime can get a faster response from CloudWatch then + // setting 12:07 or 12:29 as the EndTime. + // // EndTime is a required field EndTime *time.Time `type:"timestamp" required:"true"` @@ -2710,6 +2847,12 @@ type GetMetricDataInput struct { // The time stamp indicating the earliest data to be returned. // + // For better performance, specify StartTime and EndTime values that align with + // the value of the metric's Period and sync up with the beginning and end of + // an hour. For example, if the Period of a metric is 5 minutes, specifying + // 12:05 or 12:30 as StartTime can get a faster response from CloudWatch then + // setting 12:07 or 12:29 as the StartTime. + // // StartTime is a required field StartTime *time.Time `type:"timestamp" required:"true"` } @@ -2846,7 +2989,8 @@ type GetMetricStatisticsInput struct { // The percentile statistics. Specify values between p0.0 and p100. When calling // GetMetricStatistics, you must specify either Statistics or ExtendedStatistics, - // but not both. + // but not both. Percentile statistics are not available for metrics when any + // of the metric values are negative numbers. ExtendedStatistics []*string `min:"1" type:"list"` // The name of the metric, with or without spaces. @@ -3067,6 +3211,115 @@ func (s *GetMetricStatisticsOutput) SetLabel(v string) *GetMetricStatisticsOutpu return s } +type GetMetricWidgetImageInput struct { + _ struct{} `type:"structure"` + + // A JSON string that defines the bitmap graph to be retrieved. The string includes + // the metrics to include in the graph, statistics, annotations, title, axis + // limits, and so on. You can include only one MetricWidget parameter in each + // GetMetricWidgetImage call. + // + // For more information about the syntax of MetricWidget see CloudWatch-Metric-Widget-Structure. + // + // If any metric on the graph could not load all the requested data points, + // an orange triangle with an exclamation point appears next to the graph legend. + // + // MetricWidget is a required field + MetricWidget *string `type:"string" required:"true"` + + // The format of the resulting image. Only PNG images are supported. + // + // The default is png. If you specify png, the API returns an HTTP response + // with the content-type set to text/xml. The image data is in a MetricWidgetImage + // field. For example: + // + // + // + // + // + // + // + // iVBORw0KGgoAAAANSUhEUgAAAlgAAAGQEAYAAAAip... + // + // + // + // + // + // + // + // 6f0d4192-4d42-11e8-82c1-f539a07e0e3b + // + // + // + // + // + // The image/png setting is intended only for custom HTTP requests. For most + // use cases, and all actions using an AWS SDK, you should use png. If you specify + // image/png, the HTTP response has a content-type set to image/png, and the + // body of the response is a PNG image. + OutputFormat *string `type:"string"` +} + +// String returns the string representation +func (s GetMetricWidgetImageInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s GetMetricWidgetImageInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *GetMetricWidgetImageInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "GetMetricWidgetImageInput"} + if s.MetricWidget == nil { + invalidParams.Add(request.NewErrParamRequired("MetricWidget")) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetMetricWidget sets the MetricWidget field's value. +func (s *GetMetricWidgetImageInput) SetMetricWidget(v string) *GetMetricWidgetImageInput { + s.MetricWidget = &v + return s +} + +// SetOutputFormat sets the OutputFormat field's value. +func (s *GetMetricWidgetImageInput) SetOutputFormat(v string) *GetMetricWidgetImageInput { + s.OutputFormat = &v + return s +} + +type GetMetricWidgetImageOutput struct { + _ struct{} `type:"structure"` + + // The image of the graph, in the output format specified. + // + // MetricWidgetImage is automatically base64 encoded/decoded by the SDK. + MetricWidgetImage []byte `type:"blob"` +} + +// String returns the string representation +func (s GetMetricWidgetImageOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s GetMetricWidgetImageOutput) GoString() string { + return s.String() +} + +// SetMetricWidgetImage sets the MetricWidgetImage field's value. +func (s *GetMetricWidgetImageOutput) SetMetricWidgetImage(v []byte) *GetMetricWidgetImageOutput { + s.MetricWidgetImage = v + return s +} + type ListDashboardsInput struct { _ struct{} `type:"structure"` @@ -3792,6 +4045,15 @@ func (s *MetricDataResult) SetValues(v []*float64) *MetricDataResult { type MetricDatum struct { _ struct{} `type:"structure"` + // Array of numbers that is used along with the Values array. Each number in + // the Count array is the number of times the corresponding value in the Values + // array occurred during the period. + // + // If you omit the Counts array, the default of 1 is used as the value for each + // count. If you include a Counts array, it must include the same amount of + // values as the Values array. + Counts []*float64 `type:"list"` + // The dimensions associated with the metric. Dimensions []*Dimension `type:"list"` @@ -3829,6 +4091,19 @@ type MetricDatum struct { // In addition, special values (for example, NaN, +Infinity, -Infinity) are // not supported. Value *float64 `type:"double"` + + // Array of numbers representing the values for the metric during the period. + // Each unique value is listed just once in this array, and the corresponding + // number in the Counts array specifies the number of times that value occurred + // during the period. You can include up to 150 unique values in each PutMetricData + // action that specifies a Values array. + // + // Although the Values array accepts numbers of type Double, CloudWatch rejects + // values that are either too small or too large. Values must be in the range + // of 8.515920e-109 to 1.174271e+108 (Base 10) or 2e-360 to 2e360 (Base 2). + // In addition, special values (for example, NaN, +Infinity, -Infinity) are + // not supported. + Values []*float64 `type:"list"` } // String returns the string representation @@ -3875,6 +4150,12 @@ func (s *MetricDatum) Validate() error { return nil } +// SetCounts sets the Counts field's value. +func (s *MetricDatum) SetCounts(v []*float64) *MetricDatum { + s.Counts = v + return s +} + // SetDimensions sets the Dimensions field's value. func (s *MetricDatum) SetDimensions(v []*Dimension) *MetricDatum { s.Dimensions = v @@ -3917,6 +4198,12 @@ func (s *MetricDatum) SetValue(v float64) *MetricDatum { return s } +// SetValues sets the Values field's value. +func (s *MetricDatum) SetValues(v []*float64) *MetricDatum { + s.Values = v + return s +} + // This structure defines the metric to be returned, along with the statistics, // period, and units. type MetricStat struct { @@ -4105,11 +4392,11 @@ type PutMetricAlarmInput struct { // // Valid Values: arn:aws:automate:region:ec2:stop | arn:aws:automate:region:ec2:terminate // | arn:aws:automate:region:ec2:recover | arn:aws:sns:region:account-id:sns-topic-name - // | arn:aws:autoscaling:region:account-id:scalingPolicy:policy-id autoScalingGroupName/group-friendly-name:policyName/policy-friendly-name + // | arn:aws:autoscaling:region:account-id:scalingPolicy:policy-idautoScalingGroupName/group-friendly-name:policyName/policy-friendly-name // - // Valid Values (for use with IAM roles): arn:aws:swf:region:{account-id}:action/actions/AWS_EC2.InstanceId.Stop/1.0 - // | arn:aws:swf:region:{account-id}:action/actions/AWS_EC2.InstanceId.Terminate/1.0 - // | arn:aws:swf:region:{account-id}:action/actions/AWS_EC2.InstanceId.Reboot/1.0 + // Valid Values (for use with IAM roles): arn:aws:swf:region:account-id:action/actions/AWS_EC2.InstanceId.Stop/1.0 + // | arn:aws:swf:region:account-id:action/actions/AWS_EC2.InstanceId.Terminate/1.0 + // | arn:aws:swf:region:account-id:action/actions/AWS_EC2.InstanceId.Reboot/1.0 AlarmActions []*string `type:"list"` // The description for the alarm. @@ -4167,11 +4454,11 @@ type PutMetricAlarmInput struct { // // Valid Values: arn:aws:automate:region:ec2:stop | arn:aws:automate:region:ec2:terminate // | arn:aws:automate:region:ec2:recover | arn:aws:sns:region:account-id:sns-topic-name - // | arn:aws:autoscaling:region:account-id:scalingPolicy:policy-id autoScalingGroupName/group-friendly-name:policyName/policy-friendly-name + // | arn:aws:autoscaling:region:account-id:scalingPolicy:policy-idautoScalingGroupName/group-friendly-name:policyName/policy-friendly-name // - // Valid Values (for use with IAM roles): arn:aws:swf:region:{account-id}:action/actions/AWS_EC2.InstanceId.Stop/1.0 - // | arn:aws:swf:region:{account-id}:action/actions/AWS_EC2.InstanceId.Terminate/1.0 - // | arn:aws:swf:region:{account-id}:action/actions/AWS_EC2.InstanceId.Reboot/1.0 + // Valid Values (for use with IAM roles): >arn:aws:swf:region:account-id:action/actions/AWS_EC2.InstanceId.Stop/1.0 + // | arn:aws:swf:region:account-id:action/actions/AWS_EC2.InstanceId.Terminate/1.0 + // | arn:aws:swf:region:account-id:action/actions/AWS_EC2.InstanceId.Reboot/1.0 InsufficientDataActions []*string `type:"list"` // The name for the metric associated with the alarm. @@ -4189,11 +4476,11 @@ type PutMetricAlarmInput struct { // // Valid Values: arn:aws:automate:region:ec2:stop | arn:aws:automate:region:ec2:terminate // | arn:aws:automate:region:ec2:recover | arn:aws:sns:region:account-id:sns-topic-name - // | arn:aws:autoscaling:region:account-id:scalingPolicy:policy-id autoScalingGroupName/group-friendly-name:policyName/policy-friendly-name + // | arn:aws:autoscaling:region:account-id:scalingPolicy:policy-idautoScalingGroupName/group-friendly-name:policyName/policy-friendly-name // - // Valid Values (for use with IAM roles): arn:aws:swf:region:{account-id}:action/actions/AWS_EC2.InstanceId.Stop/1.0 - // | arn:aws:swf:region:{account-id}:action/actions/AWS_EC2.InstanceId.Terminate/1.0 - // | arn:aws:swf:region:{account-id}:action/actions/AWS_EC2.InstanceId.Reboot/1.0 + // Valid Values (for use with IAM roles): arn:aws:swf:region:account-id:action/actions/AWS_EC2.InstanceId.Stop/1.0 + // | arn:aws:swf:region:account-id:action/actions/AWS_EC2.InstanceId.Terminate/1.0 + // | arn:aws:swf:region:account-id:action/actions/AWS_EC2.InstanceId.Reboot/1.0 OKActions []*string `type:"list"` // The period, in seconds, over which the specified statistic is applied. Valid @@ -4450,7 +4737,8 @@ func (s PutMetricAlarmOutput) GoString() string { type PutMetricDataInput struct { _ struct{} `type:"structure"` - // The data for the metric. + // The data for the metric. The array can include no more than 20 metrics per + // call. // // MetricData is a required field MetricData []*MetricDatum `type:"list" required:"true"` diff --git a/vendor/github.com/aws/aws-sdk-go/service/codebuild/api.go b/vendor/github.com/aws/aws-sdk-go/service/codebuild/api.go index 41ad39eeb7c..5521655604a 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/codebuild/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/codebuild/api.go @@ -2051,6 +2051,70 @@ func (s *BuildPhase) SetStartTime(v time.Time) *BuildPhase { return s } +// Information about Amazon CloudWatch Logs for a build project. +type CloudWatchLogsConfig struct { + _ struct{} `type:"structure"` + + // The group name of the Amazon CloudWatch Logs. For more information, see Working + // with Log Groups and Log Streams (http://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/Working-with-log-groups-and-streams.html) + GroupName *string `locationName:"groupName" type:"string"` + + // The current status of the Amazon CloudWatch Logs for a build project. Valid + // values are: + // + // * ENABLED: Amazon CloudWatch Logs are enabled for this build project. + // + // * DISABLED: Amazon CloudWatch Logs are not enabled for this build project. + // + // Status is a required field + Status *string `locationName:"status" type:"string" required:"true" enum:"LogsConfigStatusType"` + + // The prefix of the stream name of the Amazon CloudWatch Logs. For more information, + // see Working with Log Groups and Log Streams (http://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/Working-with-log-groups-and-streams.html) + StreamName *string `locationName:"streamName" type:"string"` +} + +// String returns the string representation +func (s CloudWatchLogsConfig) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s CloudWatchLogsConfig) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *CloudWatchLogsConfig) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "CloudWatchLogsConfig"} + if s.Status == nil { + invalidParams.Add(request.NewErrParamRequired("Status")) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetGroupName sets the GroupName field's value. +func (s *CloudWatchLogsConfig) SetGroupName(v string) *CloudWatchLogsConfig { + s.GroupName = &v + return s +} + +// SetStatus sets the Status field's value. +func (s *CloudWatchLogsConfig) SetStatus(v string) *CloudWatchLogsConfig { + s.Status = &v + return s +} + +// SetStreamName sets the StreamName field's value. +func (s *CloudWatchLogsConfig) SetStreamName(v string) *CloudWatchLogsConfig { + s.StreamName = &v + return s +} + type CreateProjectInput struct { _ struct{} `type:"structure"` @@ -2082,6 +2146,10 @@ type CreateProjectInput struct { // Environment is a required field Environment *ProjectEnvironment `locationName:"environment" type:"structure" required:"true"` + // Information about logs for the build project. Logs can be Amazon CloudWatch + // Logs, uploaded to a specified S3 bucket, or both. + LogsConfig *LogsConfig `locationName:"logsConfig" type:"structure"` + // The name of the build project. // // Name is a required field @@ -2175,6 +2243,11 @@ func (s *CreateProjectInput) Validate() error { invalidParams.AddNested("Environment", err.(request.ErrInvalidParams)) } } + if s.LogsConfig != nil { + if err := s.LogsConfig.Validate(); err != nil { + invalidParams.AddNested("LogsConfig", err.(request.ErrInvalidParams)) + } + } if s.SecondaryArtifacts != nil { for i, v := range s.SecondaryArtifacts { if v == nil { @@ -2258,6 +2331,12 @@ func (s *CreateProjectInput) SetEnvironment(v *ProjectEnvironment) *CreateProjec return s } +// SetLogsConfig sets the LogsConfig field's value. +func (s *CreateProjectInput) SetLogsConfig(v *LogsConfig) *CreateProjectInput { + s.LogsConfig = v + return s +} + // SetName sets the Name field's value. func (s *CreateProjectInput) SetName(v string) *CreateProjectInput { s.Name = &v @@ -3087,16 +3166,81 @@ func (s *ListProjectsOutput) SetProjects(v []*string) *ListProjectsOutput { return s } +// Information about logs for a build project. Logs can be Amazon CloudWatch +// Logs, built in a specified S3 bucket, or both. +type LogsConfig struct { + _ struct{} `type:"structure"` + + // Information about Amazon CloudWatch Logs for a build project. Amazon CloudWatch + // Logs are enabled by default. + CloudWatchLogs *CloudWatchLogsConfig `locationName:"cloudWatchLogs" type:"structure"` + + // Information about logs built to an S3 bucket for a build project. S3 logs + // are not enabled by default. + S3Logs *S3LogsConfig `locationName:"s3Logs" type:"structure"` +} + +// String returns the string representation +func (s LogsConfig) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s LogsConfig) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *LogsConfig) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "LogsConfig"} + if s.CloudWatchLogs != nil { + if err := s.CloudWatchLogs.Validate(); err != nil { + invalidParams.AddNested("CloudWatchLogs", err.(request.ErrInvalidParams)) + } + } + if s.S3Logs != nil { + if err := s.S3Logs.Validate(); err != nil { + invalidParams.AddNested("S3Logs", err.(request.ErrInvalidParams)) + } + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetCloudWatchLogs sets the CloudWatchLogs field's value. +func (s *LogsConfig) SetCloudWatchLogs(v *CloudWatchLogsConfig) *LogsConfig { + s.CloudWatchLogs = v + return s +} + +// SetS3Logs sets the S3Logs field's value. +func (s *LogsConfig) SetS3Logs(v *S3LogsConfig) *LogsConfig { + s.S3Logs = v + return s +} + // Information about build logs in Amazon CloudWatch Logs. type LogsLocation struct { _ struct{} `type:"structure"` + // Information about Amazon CloudWatch Logs for a build project. + CloudWatchLogs *CloudWatchLogsConfig `locationName:"cloudWatchLogs" type:"structure"` + // The URL to an individual build log in Amazon CloudWatch Logs. DeepLink *string `locationName:"deepLink" type:"string"` // The name of the Amazon CloudWatch Logs group for the build logs. GroupName *string `locationName:"groupName" type:"string"` + // The URL to an individual build log in an S3 bucket. + S3DeepLink *string `locationName:"s3DeepLink" type:"string"` + + // Information about S3 logs for a build project. + S3Logs *S3LogsConfig `locationName:"s3Logs" type:"structure"` + // The name of the Amazon CloudWatch Logs stream for the build logs. StreamName *string `locationName:"streamName" type:"string"` } @@ -3111,6 +3255,12 @@ func (s LogsLocation) GoString() string { return s.String() } +// SetCloudWatchLogs sets the CloudWatchLogs field's value. +func (s *LogsLocation) SetCloudWatchLogs(v *CloudWatchLogsConfig) *LogsLocation { + s.CloudWatchLogs = v + return s +} + // SetDeepLink sets the DeepLink field's value. func (s *LogsLocation) SetDeepLink(v string) *LogsLocation { s.DeepLink = &v @@ -3123,6 +3273,18 @@ func (s *LogsLocation) SetGroupName(v string) *LogsLocation { return s } +// SetS3DeepLink sets the S3DeepLink field's value. +func (s *LogsLocation) SetS3DeepLink(v string) *LogsLocation { + s.S3DeepLink = &v + return s +} + +// SetS3Logs sets the S3Logs field's value. +func (s *LogsLocation) SetS3Logs(v *S3LogsConfig) *LogsLocation { + s.S3Logs = v + return s +} + // SetStreamName sets the StreamName field's value. func (s *LogsLocation) SetStreamName(v string) *LogsLocation { s.StreamName = &v @@ -3233,6 +3395,10 @@ type Project struct { // format. LastModified *time.Time `locationName:"lastModified" type:"timestamp"` + // Information about logs for the build project. A project can create Amazon + // CloudWatch Logs, logs in an S3 bucket, or both. + LogsConfig *LogsConfig `locationName:"logsConfig" type:"structure"` + // The name of the build project. Name *string `locationName:"name" min:"2" type:"string"` @@ -3333,6 +3499,12 @@ func (s *Project) SetLastModified(v time.Time) *Project { return s } +// SetLogsConfig sets the LogsConfig field's value. +func (s *Project) SetLogsConfig(v *LogsConfig) *Project { + s.LogsConfig = v + return s +} + // SetName sets the Name field's value. func (s *Project) SetName(v string) *Project { s.Name = &v @@ -3908,6 +4080,8 @@ type ProjectSource struct { // // * GITHUB: The source code is in a GitHub repository. // + // * NO_SOURCE: The project does not have input source code. + // // * S3: The source code is in an Amazon Simple Storage Service (Amazon S3) // input bucket. // @@ -4062,6 +4236,60 @@ func (s *ProjectSourceVersion) SetSourceVersion(v string) *ProjectSourceVersion return s } +// Information about S3 logs for a build project. +type S3LogsConfig struct { + _ struct{} `type:"structure"` + + // The ARN of an S3 bucket and the path prefix for S3 logs. If your Amazon S3 + // bucket name is my-bucket, and your path prefix is build-log, then acceptable + // formats are my-bucket/build-log or aws:s3:::my-bucket/build-log. + Location *string `locationName:"location" type:"string"` + + // The current status of the S3 build logs. Valid values are: + // + // * ENABLED: S3 build logs are enabled for this build project. + // + // * DISABLED: S3 build logs are not enabled for this build project. + // + // Status is a required field + Status *string `locationName:"status" type:"string" required:"true" enum:"LogsConfigStatusType"` +} + +// String returns the string representation +func (s S3LogsConfig) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s S3LogsConfig) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *S3LogsConfig) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "S3LogsConfig"} + if s.Status == nil { + invalidParams.Add(request.NewErrParamRequired("Status")) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetLocation sets the Location field's value. +func (s *S3LogsConfig) SetLocation(v string) *S3LogsConfig { + s.Location = &v + return s +} + +// SetStatus sets the Status field's value. +func (s *S3LogsConfig) SetStatus(v string) *S3LogsConfig { + s.Status = &v + return s +} + // Information about the authorization settings for AWS CodeBuild to access // the source code to be built. // @@ -4168,6 +4396,10 @@ type StartBuildInput struct { // only if the build's source is GitHub Enterprise. InsecureSslOverride *bool `locationName:"insecureSslOverride" type:"boolean"` + // Log settings for this build that override the log settings defined in the + // build project. + LogsConfigOverride *LogsConfig `locationName:"logsConfigOverride" type:"structure"` + // Enable this flag to override privileged mode in the build project. PrivilegedModeOverride *bool `locationName:"privilegedModeOverride" type:"boolean"` @@ -4205,7 +4437,7 @@ type StartBuildInput struct { SourceLocationOverride *string `locationName:"sourceLocationOverride" type:"string"` // A source input type for this build that overrides the source input defined - // in the build project + // in the build project. SourceTypeOverride *string `locationName:"sourceTypeOverride" type:"string" enum:"SourceType"` // A version of the build input to be built, for this build only. If not specified, @@ -4282,6 +4514,11 @@ func (s *StartBuildInput) Validate() error { } } } + if s.LogsConfigOverride != nil { + if err := s.LogsConfigOverride.Validate(); err != nil { + invalidParams.AddNested("LogsConfigOverride", err.(request.ErrInvalidParams)) + } + } if s.SecondaryArtifactsOverride != nil { for i, v := range s.SecondaryArtifactsOverride { if v == nil { @@ -4390,6 +4627,12 @@ func (s *StartBuildInput) SetInsecureSslOverride(v bool) *StartBuildInput { return s } +// SetLogsConfigOverride sets the LogsConfigOverride field's value. +func (s *StartBuildInput) SetLogsConfigOverride(v *LogsConfig) *StartBuildInput { + s.LogsConfigOverride = v + return s +} + // SetPrivilegedModeOverride sets the PrivilegedModeOverride field's value. func (s *StartBuildInput) SetPrivilegedModeOverride(v bool) *StartBuildInput { s.PrivilegedModeOverride = &v @@ -4628,6 +4871,10 @@ type UpdateProjectInput struct { // Information to be changed about the build environment for the build project. Environment *ProjectEnvironment `locationName:"environment" type:"structure"` + // Information about logs for the build project. A project can create Amazon + // CloudWatch Logs, logs in an S3 bucket, or both. + LogsConfig *LogsConfig `locationName:"logsConfig" type:"structure"` + // The name of the build project. // // You cannot change a build project's name. @@ -4707,6 +4954,11 @@ func (s *UpdateProjectInput) Validate() error { invalidParams.AddNested("Environment", err.(request.ErrInvalidParams)) } } + if s.LogsConfig != nil { + if err := s.LogsConfig.Validate(); err != nil { + invalidParams.AddNested("LogsConfig", err.(request.ErrInvalidParams)) + } + } if s.SecondaryArtifacts != nil { for i, v := range s.SecondaryArtifacts { if v == nil { @@ -4790,6 +5042,12 @@ func (s *UpdateProjectInput) SetEnvironment(v *ProjectEnvironment) *UpdateProjec return s } +// SetLogsConfig sets the LogsConfig field's value. +func (s *UpdateProjectInput) SetLogsConfig(v *LogsConfig) *UpdateProjectInput { + s.LogsConfig = v + return s +} + // SetName sets the Name field's value. func (s *UpdateProjectInput) SetName(v string) *UpdateProjectInput { s.Name = &v @@ -5190,6 +5448,14 @@ const ( LanguageTypeBase = "BASE" ) +const ( + // LogsConfigStatusTypeEnabled is a LogsConfigStatusType enum value + LogsConfigStatusTypeEnabled = "ENABLED" + + // LogsConfigStatusTypeDisabled is a LogsConfigStatusType enum value + LogsConfigStatusTypeDisabled = "DISABLED" +) + const ( // PlatformTypeDebian is a PlatformType enum value PlatformTypeDebian = "DEBIAN" diff --git a/vendor/github.com/aws/aws-sdk-go/service/ec2/api.go b/vendor/github.com/aws/aws-sdk-go/service/ec2/api.go index 292fd5c50ed..481b6c07dc7 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/ec2/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/ec2/api.go @@ -2499,6 +2499,11 @@ func (c *EC2) CopyImageRequest(input *CopyImageInput) (req *request.Request, out // region. You specify the destination region by using its endpoint when making // the request. // +// Copies of encrypted backing snapshots for the AMI are encrypted. Copies of +// unencrypted backing snapshots remain unencrypted, unless you set Encrypted +// during the copy operation. You cannot create an unencrypted copy of an encrypted +// backing snapshot. +// // For more information about the prerequisites and limits when copying an AMI, // see Copying an AMI (http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/CopyingAMIs.html) // in the Amazon Elastic Compute Cloud User Guide. @@ -2850,8 +2855,8 @@ func (c *EC2) CreateDefaultVpcRequest(input *CreateDefaultVpcInput) (req *reques // in the Amazon Virtual Private Cloud User Guide. You cannot specify the components // of the default VPC yourself. // -// iIf you deleted your previous default VPC, you can create a default VPC. -// You cannot have more than one default VPC per Region. +// If you deleted your previous default VPC, you can create a default VPC. You +// cannot have more than one default VPC per Region. // // If your account supports EC2-Classic, you cannot use this action to create // a default VPC in a Region that supports EC2-Classic. If you want a default @@ -9836,7 +9841,7 @@ func (c *EC2) DescribeHostReservationOfferingsRequest(input *DescribeHostReserva // offerings that may not match the instance family and region of your Dedicated // Hosts. When purchasing an offering, ensure that the instance family and Region // of the offering matches that of the Dedicated Hosts with which it is to be -// associated . For more information about supported instance types, see Dedicated +// associated. For more information about supported instance types, see Dedicated // Hosts Overview (http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/dedicated-hosts-overview.html) // in the Amazon Elastic Compute Cloud User Guide. // @@ -10702,14 +10707,19 @@ func (c *EC2) DescribeInstanceCreditSpecificationsRequest(input *DescribeInstanc // DescribeInstanceCreditSpecifications API operation for Amazon Elastic Compute Cloud. // -// Describes the credit option for CPU usage of one or more of your T2 instances. -// The credit options are standard and unlimited. +// Describes the credit option for CPU usage of one or more of your T2 or T3 +// instances. The credit options are standard and unlimited. +// +// If you do not specify an instance ID, Amazon EC2 returns T2 and T3 instances +// with the unlimited credit option, as well as instances that were previously +// configured as T2 or T3 with the unlimited credit option. For example, if +// you resize a T2 instance, while it is configured as unlimited, to an M4 instance, +// Amazon EC2 returns the M4 instance. // -// If you do not specify an instance ID, Amazon EC2 returns only the T2 instances -// with the unlimited credit option. If you specify one or more instance IDs, -// Amazon EC2 returns the credit option (standard or unlimited) of those instances. -// If you specify an instance ID that is not valid, such as an instance that -// is not a T2 instance, an error is returned. +// If you specify one or more instance IDs, Amazon EC2 returns the credit option +// (standard or unlimited) of those instances. If you specify an instance ID +// that is not valid, such as an instance that is not a T2 or T3 instance, an +// error is returned. // // Recently terminated instances might appear in the returned results. This // interval is usually less than one hour. @@ -10719,7 +10729,7 @@ func (c *EC2) DescribeInstanceCreditSpecificationsRequest(input *DescribeInstanc // all, the call fails. If you specify only instance IDs in an unaffected zone, // the call works normally. // -// For more information, see T2 Instances (http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/t2-instances.html) +// For more information, see Burstable Performance Instances (http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/burstable-performance-instances.html) // in the Amazon Elastic Compute Cloud User Guide. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -11809,6 +11819,12 @@ func (c *EC2) DescribeNetworkInterfacesRequest(input *DescribeNetworkInterfacesI Name: opDescribeNetworkInterfaces, HTTPMethod: "POST", HTTPPath: "/", + Paginator: &request.Paginator{ + InputTokens: []string{"NextToken"}, + OutputTokens: []string{"NextToken"}, + LimitToken: "MaxResults", + TruncationToken: "", + }, } if input == nil { @@ -11852,6 +11868,56 @@ func (c *EC2) DescribeNetworkInterfacesWithContext(ctx aws.Context, input *Descr return out, req.Send() } +// DescribeNetworkInterfacesPages iterates over the pages of a DescribeNetworkInterfaces operation, +// calling the "fn" function with the response data for each page. To stop +// iterating, return false from the fn function. +// +// See DescribeNetworkInterfaces method for more information on how to use this operation. +// +// Note: This operation can generate multiple requests to a service. +// +// // Example iterating over at most 3 pages of a DescribeNetworkInterfaces operation. +// pageNum := 0 +// err := client.DescribeNetworkInterfacesPages(params, +// func(page *DescribeNetworkInterfacesOutput, lastPage bool) bool { +// pageNum++ +// fmt.Println(page) +// return pageNum <= 3 +// }) +// +func (c *EC2) DescribeNetworkInterfacesPages(input *DescribeNetworkInterfacesInput, fn func(*DescribeNetworkInterfacesOutput, bool) bool) error { + return c.DescribeNetworkInterfacesPagesWithContext(aws.BackgroundContext(), input, fn) +} + +// DescribeNetworkInterfacesPagesWithContext same as DescribeNetworkInterfacesPages except +// it takes a Context and allows setting request options on the pages. +// +// The context must be non-nil and will be used for request cancellation. If +// the context is nil a panic will occur. In the future the SDK may create +// sub-contexts for http.Requests. See https://golang.org/pkg/context/ +// for more information on using Contexts. +func (c *EC2) DescribeNetworkInterfacesPagesWithContext(ctx aws.Context, input *DescribeNetworkInterfacesInput, fn func(*DescribeNetworkInterfacesOutput, bool) bool, opts ...request.Option) error { + p := request.Pagination{ + NewRequest: func() (*request.Request, error) { + var inCpy *DescribeNetworkInterfacesInput + if input != nil { + tmp := *input + inCpy = &tmp + } + req, _ := c.DescribeNetworkInterfacesRequest(inCpy) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return req, nil + }, + } + + cont := true + for p.Next() && cont { + cont = fn(p.Page().(*DescribeNetworkInterfacesOutput), !p.HasNextPage()) + } + return p.Err() +} + const opDescribePlacementGroups = "DescribePlacementGroups" // DescribePlacementGroupsRequest generates a "aws/request.Request" representing the @@ -18004,7 +18070,7 @@ func (c *EC2) ModifyHostsRequest(input *ModifyHostsInput) (req *request.Request, // is enabled, any instances that you launch with a tenancy of host but without // a specific host ID are placed onto any available Dedicated Host in your account // that has auto-placement enabled. When auto-placement is disabled, you need -// to provide a host ID ito have the instance launch onto a specific host. If +// to provide a host ID to have the instance launch onto a specific host. If // no host ID is provided, the instance is launched onto a suitable host with // auto-placement enabled. // @@ -18448,10 +18514,10 @@ func (c *EC2) ModifyInstanceCreditSpecificationRequest(input *ModifyInstanceCred // ModifyInstanceCreditSpecification API operation for Amazon Elastic Compute Cloud. // -// Modifies the credit option for CPU usage on a running or stopped T2 instance. -// The credit options are standard and unlimited. +// Modifies the credit option for CPU usage on a running or stopped T2 or T3 +// instance. The credit options are standard and unlimited. // -// For more information, see T2 Instances (http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/t2-instances.html) +// For more information, see Burstable Performance Instances (http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/burstable-performance-instances.html) // in the Amazon Elastic Compute Cloud User Guide. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -20709,7 +20775,7 @@ func (c *EC2) ReleaseHostsRequest(input *ReleaseHostsInput) (req *request.Reques // When you no longer want to use an On-Demand Dedicated Host it can be released. // On-Demand billing is stopped and the host goes into released state. The host // ID of Dedicated Hosts that have been released can no longer be specified -// in another request, for example, ModifyHosts. You must stop or terminate +// in another request, for example, to modify the host. You must stop or terminate // all instances on a host before it can be released. // // When Dedicated Hosts are released, it may take some time for them to stop @@ -23133,7 +23199,6 @@ func (s *AcceptVpcEndpointConnectionsOutput) SetUnsuccessful(v []*UnsuccessfulIt return s } -// Contains the parameters for AcceptVpcPeeringConnection. type AcceptVpcPeeringConnectionInput struct { _ struct{} `type:"structure"` @@ -23170,7 +23235,6 @@ func (s *AcceptVpcPeeringConnectionInput) SetVpcPeeringConnectionId(v string) *A return s } -// Contains the output of AcceptVpcPeeringConnection. type AcceptVpcPeeringConnectionOutput struct { _ struct{} `type:"structure"` @@ -23493,7 +23557,6 @@ func (s *AllocateAddressOutput) SetPublicIp(v string) *AllocateAddressOutput { return s } -// Contains the parameters for AllocateHosts. type AllocateHostsInput struct { _ struct{} `type:"structure"` @@ -23525,6 +23588,9 @@ type AllocateHostsInput struct { // // Quantity is a required field Quantity *int64 `locationName:"quantity" type:"integer" required:"true"` + + // The tags to apply to the Dedicated Host during creation. + TagSpecifications []*TagSpecification `locationName:"TagSpecification" locationNameList:"item" type:"list"` } // String returns the string representation @@ -23586,6 +23652,12 @@ func (s *AllocateHostsInput) SetQuantity(v int64) *AllocateHostsInput { return s } +// SetTagSpecifications sets the TagSpecifications field's value. +func (s *AllocateHostsInput) SetTagSpecifications(v []*TagSpecification) *AllocateHostsInput { + s.TagSpecifications = v + return s +} + // Contains the output of AllocateHosts. type AllocateHostsOutput struct { _ struct{} `type:"structure"` @@ -23939,7 +24011,6 @@ func (s *AssociateAddressOutput) SetAssociationId(v string) *AssociateAddressOut return s } -// Contains the parameters for AssociateDhcpOptions. type AssociateDhcpOptionsInput struct { _ struct{} `type:"structure"` @@ -24094,7 +24165,6 @@ func (s *AssociateIamInstanceProfileOutput) SetIamInstanceProfileAssociation(v * return s } -// Contains the parameters for AssociateRouteTable. type AssociateRouteTableInput struct { _ struct{} `type:"structure"` @@ -24159,7 +24229,6 @@ func (s *AssociateRouteTableInput) SetSubnetId(v string) *AssociateRouteTableInp return s } -// Contains the output of AssociateRouteTable. type AssociateRouteTableOutput struct { _ struct{} `type:"structure"` @@ -24367,7 +24436,6 @@ func (s *AssociateVpcCidrBlockOutput) SetVpcId(v string) *AssociateVpcCidrBlockO return s } -// Contains the parameters for AttachClassicLinkVpc. type AttachClassicLinkVpcInput struct { _ struct{} `type:"structure"` @@ -24447,7 +24515,6 @@ func (s *AttachClassicLinkVpcInput) SetVpcId(v string) *AttachClassicLinkVpcInpu return s } -// Contains the output of AttachClassicLinkVpc. type AttachClassicLinkVpcOutput struct { _ struct{} `type:"structure"` @@ -24471,7 +24538,6 @@ func (s *AttachClassicLinkVpcOutput) SetReturn(v bool) *AttachClassicLinkVpcOutp return s } -// Contains the parameters for AttachInternetGateway. type AttachInternetGatewayInput struct { _ struct{} `type:"structure"` @@ -24870,7 +24936,6 @@ func (s *AttributeValue) SetValue(v string) *AttributeValue { return s } -// Contains the parameters for AuthorizeSecurityGroupEgress. type AuthorizeSecurityGroupEgressInput struct { _ struct{} `type:"structure"` @@ -25002,7 +25067,6 @@ func (s AuthorizeSecurityGroupEgressOutput) GoString() string { return s.String() } -// Contains the parameters for AuthorizeSecurityGroupIngress. type AuthorizeSecurityGroupIngressInput struct { _ struct{} `type:"structure"` @@ -26888,10 +26952,12 @@ type CopyImageInput struct { DryRun *bool `locationName:"dryRun" type:"boolean"` // Specifies whether the destination snapshots of the copied image should be - // encrypted. The default CMK for EBS is used unless a non-default AWS Key Management - // Service (AWS KMS) CMK is specified with KmsKeyId. For more information, see - // Amazon EBS Encryption (http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSEncryption.html) - // in the Amazon Elastic Compute Cloud User Guide. + // encrypted. You can encrypt a copy of an unencrypted snapshot, but you cannot + // create an unencrypted copy of an encrypted snapshot. The default CMK for + // EBS is used unless you specify a non-default AWS Key Management Service (AWS + // KMS) CMK using KmsKeyId. For more information, see Amazon EBS Encryption + // (http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSEncryption.html) in + // the Amazon Elastic Compute Cloud User Guide. Encrypted *bool `locationName:"encrypted" type:"boolean"` // An identifier for the AWS Key Management Service (AWS KMS) customer master @@ -27065,12 +27131,11 @@ type CopySnapshotInput struct { DryRun *bool `locationName:"dryRun" type:"boolean"` // Specifies whether the destination snapshot should be encrypted. You can encrypt - // a copy of an unencrypted snapshot using this flag, but you cannot use it - // to create an unencrypted copy from an encrypted snapshot. Your default CMK - // for EBS is used unless a non-default AWS Key Management Service (AWS KMS) - // CMK is specified with KmsKeyId. For more information, see Amazon EBS Encryption - // (http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSEncryption.html) in - // the Amazon Elastic Compute Cloud User Guide. + // a copy of an unencrypted snapshot, but you cannot use it to create an unencrypted + // copy of an encrypted snapshot. Your default CMK for EBS is used unless you + // specify a non-default AWS Key Management Service (AWS KMS) CMK using KmsKeyId. + // For more information, see Amazon EBS Encryption (http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSEncryption.html) + // in the Amazon Elastic Compute Cloud User Guide. Encrypted *bool `locationName:"encrypted" type:"boolean"` // An identifier for the AWS Key Management Service (AWS KMS) customer master @@ -27472,7 +27537,6 @@ func (s *CreateDefaultSubnetOutput) SetSubnet(v *Subnet) *CreateDefaultSubnetOut return s } -// Contains the parameters for CreateDefaultVpc. type CreateDefaultVpcInput struct { _ struct{} `type:"structure"` @@ -27499,7 +27563,6 @@ func (s *CreateDefaultVpcInput) SetDryRun(v bool) *CreateDefaultVpcInput { return s } -// Contains the output of CreateDefaultVpc. type CreateDefaultVpcOutput struct { _ struct{} `type:"structure"` @@ -27523,7 +27586,6 @@ func (s *CreateDefaultVpcOutput) SetVpc(v *Vpc) *CreateDefaultVpcOutput { return s } -// Contains the parameters for CreateDhcpOptions. type CreateDhcpOptionsInput struct { _ struct{} `type:"structure"` @@ -27574,7 +27636,6 @@ func (s *CreateDhcpOptionsInput) SetDryRun(v bool) *CreateDhcpOptionsInput { return s } -// Contains the output of CreateDhcpOptions. type CreateDhcpOptionsOutput struct { _ struct{} `type:"structure"` @@ -27901,7 +27962,6 @@ func (s *CreateFleetOutput) SetFleetId(v string) *CreateFleetOutput { return s } -// Contains the parameters for CreateFlowLogs. type CreateFlowLogsInput struct { _ struct{} `type:"structure"` @@ -28045,7 +28105,6 @@ func (s *CreateFlowLogsInput) SetTrafficType(v string) *CreateFlowLogsInput { return s } -// Contains the output of CreateFlowLogs. type CreateFlowLogsOutput struct { _ struct{} `type:"structure"` @@ -28422,7 +28481,6 @@ func (s *CreateInstanceExportTaskOutput) SetExportTask(v *ExportTask) *CreateIns return s } -// Contains the parameters for CreateInternetGateway. type CreateInternetGatewayInput struct { _ struct{} `type:"structure"` @@ -28449,7 +28507,6 @@ func (s *CreateInternetGatewayInput) SetDryRun(v bool) *CreateInternetGatewayInp return s } -// Contains the output of CreateInternetGateway. type CreateInternetGatewayOutput struct { _ struct{} `type:"structure"` @@ -28473,7 +28530,6 @@ func (s *CreateInternetGatewayOutput) SetInternetGateway(v *InternetGateway) *Cr return s } -// Contains the parameters for CreateKeyPair. type CreateKeyPairInput struct { _ struct{} `type:"structure"` @@ -28813,7 +28869,6 @@ func (s *CreateLaunchTemplateVersionOutput) SetLaunchTemplateVersion(v *LaunchTe return s } -// Contains the parameters for CreateNatGateway. type CreateNatGatewayInput struct { _ struct{} `type:"structure"` @@ -28880,7 +28935,6 @@ func (s *CreateNatGatewayInput) SetSubnetId(v string) *CreateNatGatewayInput { return s } -// Contains the output of CreateNatGateway. type CreateNatGatewayOutput struct { _ struct{} `type:"structure"` @@ -28914,7 +28968,6 @@ func (s *CreateNatGatewayOutput) SetNatGateway(v *NatGateway) *CreateNatGatewayO return s } -// Contains the parameters for CreateNetworkAclEntry. type CreateNetworkAclEntryInput struct { _ struct{} `type:"structure"` @@ -29083,7 +29136,6 @@ func (s CreateNetworkAclEntryOutput) GoString() string { return s.String() } -// Contains the parameters for CreateNetworkAcl. type CreateNetworkAclInput struct { _ struct{} `type:"structure"` @@ -29134,7 +29186,6 @@ func (s *CreateNetworkAclInput) SetVpcId(v string) *CreateNetworkAclInput { return s } -// Contains the output of CreateNetworkAcl. type CreateNetworkAclOutput struct { _ struct{} `type:"structure"` @@ -29613,7 +29664,6 @@ func (s *CreateReservedInstancesListingOutput) SetReservedInstancesListings(v [] return s } -// Contains the parameters for CreateRoute. type CreateRouteInput struct { _ struct{} `type:"structure"` @@ -29740,7 +29790,6 @@ func (s *CreateRouteInput) SetVpcPeeringConnectionId(v string) *CreateRouteInput return s } -// Contains the output of CreateRoute. type CreateRouteOutput struct { _ struct{} `type:"structure"` @@ -29764,7 +29813,6 @@ func (s *CreateRouteOutput) SetReturn(v bool) *CreateRouteOutput { return s } -// Contains the parameters for CreateRouteTable. type CreateRouteTableInput struct { _ struct{} `type:"structure"` @@ -29815,7 +29863,6 @@ func (s *CreateRouteTableInput) SetVpcId(v string) *CreateRouteTableInput { return s } -// Contains the output of CreateRouteTable. type CreateRouteTableOutput struct { _ struct{} `type:"structure"` @@ -29839,7 +29886,6 @@ func (s *CreateRouteTableOutput) SetRouteTable(v *RouteTable) *CreateRouteTableO return s } -// Contains the parameters for CreateSecurityGroup. type CreateSecurityGroupInput struct { _ struct{} `type:"structure"` @@ -29925,7 +29971,6 @@ func (s *CreateSecurityGroupInput) SetVpcId(v string) *CreateSecurityGroupInput return s } -// Contains the output of CreateSecurityGroup. type CreateSecurityGroupOutput struct { _ struct{} `type:"structure"` @@ -30102,7 +30147,6 @@ func (s *CreateSpotDatafeedSubscriptionOutput) SetSpotDatafeedSubscription(v *Sp return s } -// Contains the parameters for CreateSubnet. type CreateSubnetInput struct { _ struct{} `type:"structure"` @@ -30189,7 +30233,6 @@ func (s *CreateSubnetInput) SetVpcId(v string) *CreateSubnetInput { return s } -// Contains the output of CreateSubnet. type CreateSubnetOutput struct { _ struct{} `type:"structure"` @@ -30213,7 +30256,6 @@ func (s *CreateSubnetOutput) SetSubnet(v *Subnet) *CreateSubnetOutput { return s } -// Contains the parameters for CreateTags. type CreateTagsInput struct { _ struct{} `type:"structure"` @@ -30687,7 +30729,7 @@ type CreateVpcEndpointInput struct { // true: enableDnsHostnames and enableDnsSupport. Use ModifyVpcAttribute to // set the VPC attributes. // - // Default: true + // Default: false PrivateDnsEnabled *bool `type:"boolean"` // (Gateway endpoint) One or more route table IDs. @@ -30942,7 +30984,6 @@ func (s *CreateVpcEndpointServiceConfigurationOutput) SetServiceConfiguration(v return s } -// Contains the parameters for CreateVpc. type CreateVpcInput struct { _ struct{} `type:"structure"` @@ -31022,7 +31063,6 @@ func (s *CreateVpcInput) SetInstanceTenancy(v string) *CreateVpcInput { return s } -// Contains the output of CreateVpc. type CreateVpcOutput struct { _ struct{} `type:"structure"` @@ -31046,7 +31086,6 @@ func (s *CreateVpcOutput) SetVpc(v *Vpc) *CreateVpcOutput { return s } -// Contains the parameters for CreateVpcPeeringConnection. type CreateVpcPeeringConnectionInput struct { _ struct{} `type:"structure"` @@ -31115,7 +31154,6 @@ func (s *CreateVpcPeeringConnectionInput) SetVpcId(v string) *CreateVpcPeeringCo return s } -// Contains the output of CreateVpcPeeringConnection. type CreateVpcPeeringConnectionOutput struct { _ struct{} `type:"structure"` @@ -31415,12 +31453,12 @@ func (s *CreateVpnGatewayOutput) SetVpnGateway(v *VpnGateway) *CreateVpnGatewayO return s } -// Describes the credit option for CPU usage of a T2 instance. +// Describes the credit option for CPU usage of a T2 or T3 instance. type CreditSpecification struct { _ struct{} `type:"structure"` - // The credit option for CPU usage of a T2 instance. Valid values are standard - // and unlimited. + // The credit option for CPU usage of a T2 or T3 instance. Valid values are + // standard and unlimited. CpuCredits *string `locationName:"cpuCredits" type:"string"` } @@ -31440,12 +31478,12 @@ func (s *CreditSpecification) SetCpuCredits(v string) *CreditSpecification { return s } -// The credit option for CPU usage of a T2 instance. +// The credit option for CPU usage of a T2 or T3 instance. type CreditSpecificationRequest struct { _ struct{} `type:"structure"` - // The credit option for CPU usage of a T2 instance. Valid values are standard - // and unlimited. + // The credit option for CPU usage of a T2 or T3 instance. Valid values are + // standard and unlimited. // // CpuCredits is a required field CpuCredits *string `type:"string" required:"true"` @@ -31616,7 +31654,6 @@ func (s DeleteCustomerGatewayOutput) GoString() string { return s.String() } -// Contains the parameters for DeleteDhcpOptions. type DeleteDhcpOptionsInput struct { _ struct{} `type:"structure"` @@ -31959,7 +31996,6 @@ func (s *DeleteFleetsOutput) SetUnsuccessfulFleetDeletions(v []*DeleteFleetError return s } -// Contains the parameters for DeleteFlowLogs. type DeleteFlowLogsInput struct { _ struct{} `type:"structure"` @@ -32010,7 +32046,6 @@ func (s *DeleteFlowLogsInput) SetFlowLogIds(v []*string) *DeleteFlowLogsInput { return s } -// Contains the output of DeleteFlowLogs. type DeleteFlowLogsOutput struct { _ struct{} `type:"structure"` @@ -32107,7 +32142,6 @@ func (s *DeleteFpgaImageOutput) SetReturn(v bool) *DeleteFpgaImageOutput { return s } -// Contains the parameters for DeleteInternetGateway. type DeleteInternetGatewayInput struct { _ struct{} `type:"structure"` @@ -32172,7 +32206,6 @@ func (s DeleteInternetGatewayOutput) GoString() string { return s.String() } -// Contains the parameters for DeleteKeyPair. type DeleteKeyPairInput struct { _ struct{} `type:"structure"` @@ -32517,7 +32550,6 @@ func (s *DeleteLaunchTemplateVersionsResponseSuccessItem) SetVersionNumber(v int return s } -// Contains the parameters for DeleteNatGateway. type DeleteNatGatewayInput struct { _ struct{} `type:"structure"` @@ -32556,7 +32588,6 @@ func (s *DeleteNatGatewayInput) SetNatGatewayId(v string) *DeleteNatGatewayInput return s } -// Contains the output of DeleteNatGateway. type DeleteNatGatewayOutput struct { _ struct{} `type:"structure"` @@ -32580,7 +32611,6 @@ func (s *DeleteNatGatewayOutput) SetNatGatewayId(v string) *DeleteNatGatewayOutp return s } -// Contains the parameters for DeleteNetworkAclEntry. type DeleteNetworkAclEntryInput struct { _ struct{} `type:"structure"` @@ -32673,7 +32703,6 @@ func (s DeleteNetworkAclEntryOutput) GoString() string { return s.String() } -// Contains the parameters for DeleteNetworkAcl. type DeleteNetworkAclInput struct { _ struct{} `type:"structure"` @@ -32953,7 +32982,6 @@ func (s DeletePlacementGroupOutput) GoString() string { return s.String() } -// Contains the parameters for DeleteRoute. type DeleteRouteInput struct { _ struct{} `type:"structure"` @@ -33038,7 +33066,6 @@ func (s DeleteRouteOutput) GoString() string { return s.String() } -// Contains the parameters for DeleteRouteTable. type DeleteRouteTableInput struct { _ struct{} `type:"structure"` @@ -33103,7 +33130,6 @@ func (s DeleteRouteTableOutput) GoString() string { return s.String() } -// Contains the parameters for DeleteSecurityGroup. type DeleteSecurityGroupInput struct { _ struct{} `type:"structure"` @@ -33269,7 +33295,6 @@ func (s DeleteSpotDatafeedSubscriptionOutput) GoString() string { return s.String() } -// Contains the parameters for DeleteSubnet. type DeleteSubnetInput struct { _ struct{} `type:"structure"` @@ -33334,7 +33359,6 @@ func (s DeleteSubnetOutput) GoString() string { return s.String() } -// Contains the parameters for DeleteTags. type DeleteTagsInput struct { _ struct{} `type:"structure"` @@ -33701,7 +33725,6 @@ func (s *DeleteVpcEndpointsOutput) SetUnsuccessful(v []*UnsuccessfulItem) *Delet return s } -// Contains the parameters for DeleteVpc. type DeleteVpcInput struct { _ struct{} `type:"structure"` @@ -33766,7 +33789,6 @@ func (s DeleteVpcOutput) GoString() string { return s.String() } -// Contains the parameters for DeleteVpcPeeringConnection. type DeleteVpcPeeringConnectionInput struct { _ struct{} `type:"structure"` @@ -33817,7 +33839,6 @@ func (s *DeleteVpcPeeringConnectionInput) SetVpcPeeringConnectionId(v string) *D return s } -// Contains the output of DeleteVpcPeeringConnection. type DeleteVpcPeeringConnectionOutput struct { _ struct{} `type:"structure"` @@ -34507,7 +34528,6 @@ func (s *DescribeBundleTasksOutput) SetBundleTasks(v []*BundleTask) *DescribeBun return s } -// Contains the parameters for DescribeClassicLinkInstances. type DescribeClassicLinkInstancesInput struct { _ struct{} `type:"structure"` @@ -34596,7 +34616,6 @@ func (s *DescribeClassicLinkInstancesInput) SetNextToken(v string) *DescribeClas return s } -// Contains the output of DescribeClassicLinkInstances. type DescribeClassicLinkInstancesOutput struct { _ struct{} `type:"structure"` @@ -34785,7 +34804,6 @@ func (s *DescribeCustomerGatewaysOutput) SetCustomerGateways(v []*CustomerGatewa return s } -// Contains the parameters for DescribeDhcpOptions. type DescribeDhcpOptionsInput struct { _ struct{} `type:"structure"` @@ -34848,7 +34866,6 @@ func (s *DescribeDhcpOptionsInput) SetFilters(v []*Filter) *DescribeDhcpOptionsI return s } -// Contains the output of DescribeDhcpOptions. type DescribeDhcpOptionsOutput struct { _ struct{} `type:"structure"` @@ -35515,7 +35532,6 @@ func (s *DescribeFleetsOutput) SetNextToken(v string) *DescribeFleetsOutput { return s } -// Contains the parameters for DescribeFlowLogs. type DescribeFlowLogsInput struct { _ struct{} `type:"structure"` @@ -35596,7 +35612,6 @@ func (s *DescribeFlowLogsInput) SetNextToken(v string) *DescribeFlowLogsInput { return s } -// Contains the output of DescribeFlowLogs. type DescribeFlowLogsOutput struct { _ struct{} `type:"structure"` @@ -36002,7 +36017,7 @@ type DescribeHostReservationsInput struct { // The maximum number of results to return for the request in a single page. // The remaining results can be seen by sending another request with the returned - // nextToken value. This value can be between 5 and 500.If maxResults is given + // nextToken value. This value can be between 5 and 500. If maxResults is given // a larger value than 500, you receive an error. MaxResults *int64 `type:"integer"` @@ -36077,7 +36092,6 @@ func (s *DescribeHostReservationsOutput) SetNextToken(v string) *DescribeHostRes return s } -// Contains the parameters for DescribeHosts. type DescribeHostsInput struct { _ struct{} `type:"structure"` @@ -36152,7 +36166,6 @@ func (s *DescribeHostsInput) SetNextToken(v string) *DescribeHostsInput { return s } -// Contains the output of DescribeHosts. type DescribeHostsOutput struct { _ struct{} `type:"structure"` @@ -37759,7 +37772,6 @@ func (s *DescribeInstancesOutput) SetReservations(v []*Reservation) *DescribeIns return s } -// Contains the parameters for DescribeInternetGateways. type DescribeInternetGatewaysInput struct { _ struct{} `type:"structure"` @@ -37823,7 +37835,6 @@ func (s *DescribeInternetGatewaysInput) SetInternetGatewayIds(v []*string) *Desc return s } -// Contains the output of DescribeInternetGateways. type DescribeInternetGatewaysOutput struct { _ struct{} `type:"structure"` @@ -37847,7 +37858,6 @@ func (s *DescribeInternetGatewaysOutput) SetInternetGateways(v []*InternetGatewa return s } -// Contains the parameters for DescribeKeyPairs. type DescribeKeyPairsInput struct { _ struct{} `type:"structure"` @@ -37898,7 +37908,6 @@ func (s *DescribeKeyPairsInput) SetKeyNames(v []*string) *DescribeKeyPairsInput return s } -// Contains the output of DescribeKeyPairs. type DescribeKeyPairsOutput struct { _ struct{} `type:"structure"` @@ -38313,7 +38322,6 @@ func (s *DescribeMovingAddressesOutput) SetNextToken(v string) *DescribeMovingAd return s } -// Contains the parameters for DescribeNatGateways. type DescribeNatGatewaysInput struct { _ struct{} `type:"structure"` @@ -38388,7 +38396,6 @@ func (s *DescribeNatGatewaysInput) SetNextToken(v string) *DescribeNatGatewaysIn return s } -// Contains the output of DescribeNatGateways. type DescribeNatGatewaysOutput struct { _ struct{} `type:"structure"` @@ -38422,7 +38429,6 @@ func (s *DescribeNatGatewaysOutput) SetNextToken(v string) *DescribeNatGatewaysO return s } -// Contains the parameters for DescribeNetworkAcls. type DescribeNetworkAclsInput struct { _ struct{} `type:"structure"` @@ -38446,8 +38452,6 @@ type DescribeNetworkAclsInput struct { // // * entry.cidr - The IPv4 CIDR range specified in the entry. // - // * entry.egress - Indicates whether the entry applies to egress traffic. - // // * entry.icmp.code - The ICMP code specified in the entry, if any. // // * entry.icmp.type - The ICMP type specified in the entry, if any. @@ -38466,7 +38470,7 @@ type DescribeNetworkAclsInput struct { // * entry.rule-action - Allows or denies the matching traffic (allow | deny). // // * entry.rule-number - The number of an entry (in other words, rule) in - // the ACL's set of entries. + // the set of ACL entries. // // * network-acl-id - The ID of the network ACL. // @@ -38517,7 +38521,6 @@ func (s *DescribeNetworkAclsInput) SetNetworkAclIds(v []*string) *DescribeNetwor return s } -// Contains the output of DescribeNetworkAcls. type DescribeNetworkAclsOutput struct { _ struct{} `type:"structure"` @@ -38877,10 +38880,18 @@ type DescribeNetworkInterfacesInput struct { // * vpc-id - The ID of the VPC for the network interface. Filters []*Filter `locationName:"filter" locationNameList:"Filter" type:"list"` + // The maximum number of items to return for this request. The request returns + // a token that you can specify in a subsequent call to get the next set of + // results. + MaxResults *int64 `type:"integer"` + // One or more network interface IDs. // // Default: Describes all your network interfaces. NetworkInterfaceIds []*string `locationName:"NetworkInterfaceId" locationNameList:"item" type:"list"` + + // The token to retrieve the next page of results. + NextToken *string `type:"string"` } // String returns the string representation @@ -38905,18 +38916,34 @@ func (s *DescribeNetworkInterfacesInput) SetFilters(v []*Filter) *DescribeNetwor return s } +// SetMaxResults sets the MaxResults field's value. +func (s *DescribeNetworkInterfacesInput) SetMaxResults(v int64) *DescribeNetworkInterfacesInput { + s.MaxResults = &v + return s +} + // SetNetworkInterfaceIds sets the NetworkInterfaceIds field's value. func (s *DescribeNetworkInterfacesInput) SetNetworkInterfaceIds(v []*string) *DescribeNetworkInterfacesInput { s.NetworkInterfaceIds = v return s } +// SetNextToken sets the NextToken field's value. +func (s *DescribeNetworkInterfacesInput) SetNextToken(v string) *DescribeNetworkInterfacesInput { + s.NextToken = &v + return s +} + // Contains the output of DescribeNetworkInterfaces. type DescribeNetworkInterfacesOutput struct { _ struct{} `type:"structure"` // Information about one or more network interfaces. NetworkInterfaces []*NetworkInterface `locationName:"networkInterfaceSet" locationNameList:"item" type:"list"` + + // The token to use to retrieve the next page of results. This value is null + // when there are no more results to return. + NextToken *string `locationName:"nextToken" type:"string"` } // String returns the string representation @@ -38935,6 +38962,12 @@ func (s *DescribeNetworkInterfacesOutput) SetNetworkInterfaces(v []*NetworkInter return s } +// SetNextToken sets the NextToken field's value. +func (s *DescribeNetworkInterfacesOutput) SetNextToken(v string) *DescribeNetworkInterfacesOutput { + s.NextToken = &v + return s +} + // Contains the parameters for DescribePlacementGroups. type DescribePlacementGroupsInput struct { _ struct{} `type:"structure"` @@ -39013,7 +39046,6 @@ func (s *DescribePlacementGroupsOutput) SetPlacementGroups(v []*PlacementGroup) return s } -// Contains the parameters for DescribePrefixLists. type DescribePrefixListsInput struct { _ struct{} `type:"structure"` @@ -39086,7 +39118,6 @@ func (s *DescribePrefixListsInput) SetPrefixListIds(v []*string) *DescribePrefix return s } -// Contains the output of DescribePrefixLists. type DescribePrefixListsOutput struct { _ struct{} `type:"structure"` @@ -39850,7 +39881,6 @@ func (s *DescribeReservedInstancesOutput) SetReservedInstances(v []*ReservedInst return s } -// Contains the parameters for DescribeRouteTables. type DescribeRouteTablesInput struct { _ struct{} `type:"structure"` @@ -39956,7 +39986,6 @@ func (s *DescribeRouteTablesInput) SetRouteTableIds(v []*string) *DescribeRouteT return s } -// Contains the output of DescribeRouteTables. type DescribeRouteTablesOutput struct { _ struct{} `type:"structure"` @@ -40262,7 +40291,7 @@ func (s *DescribeScheduledInstancesOutput) SetScheduledInstanceSet(v []*Schedule type DescribeSecurityGroupReferencesInput struct { _ struct{} `type:"structure"` - // Checks whether you have the required permissions for the operation, without + // Checks whether you have the required permissions for the action, without // actually making the request, and provides an error response. If you have // the required permissions, the error response is DryRunOperation. Otherwise, // it is UnauthorizedOperation. @@ -40332,7 +40361,6 @@ func (s *DescribeSecurityGroupReferencesOutput) SetSecurityGroupReferenceSet(v [ return s } -// Contains the parameters for DescribeSecurityGroups. type DescribeSecurityGroupsInput struct { _ struct{} `type:"structure"` @@ -40491,7 +40519,6 @@ func (s *DescribeSecurityGroupsInput) SetNextToken(v string) *DescribeSecurityGr return s } -// Contains the output of DescribeSecurityGroups. type DescribeSecurityGroupsOutput struct { _ struct{} `type:"structure"` @@ -41553,7 +41580,7 @@ func (s *DescribeSpotPriceHistoryOutput) SetSpotPriceHistory(v []*SpotPrice) *De type DescribeStaleSecurityGroupsInput struct { _ struct{} `type:"structure"` - // Checks whether you have the required permissions for the operation, without + // Checks whether you have the required permissions for the action, without // actually making the request, and provides an error response. If you have // the required permissions, the error response is DryRunOperation. Otherwise, // it is UnauthorizedOperation. @@ -41660,7 +41687,6 @@ func (s *DescribeStaleSecurityGroupsOutput) SetStaleSecurityGroupSet(v []*StaleS return s } -// Contains the parameters for DescribeSubnets. type DescribeSubnetsInput struct { _ struct{} `type:"structure"` @@ -41745,7 +41771,6 @@ func (s *DescribeSubnetsInput) SetSubnetIds(v []*string) *DescribeSubnetsInput { return s } -// Contains the output of DescribeSubnets. type DescribeSubnetsOutput struct { _ struct{} `type:"structure"` @@ -41769,7 +41794,6 @@ func (s *DescribeSubnetsOutput) SetSubnets(v []*Subnet) *DescribeSubnetsOutput { return s } -// Contains the parameters for DescribeTags. type DescribeTagsInput struct { _ struct{} `type:"structure"` @@ -41783,13 +41807,17 @@ type DescribeTagsInput struct { // // * key - The tag key. // - // * resource-id - The resource ID. + // * resource-id - The ID of the resource. + // + // * resource-type - The resource type (customer-gateway | dedicated-host + // | dhcp-options | elastic-ip | fleet | fpga-image | image | instance | + // internet-gateway | launch-template | natgateway | network-acl | network-interface + // | reserved-instances | route-table | security-group | snapshot | spot-instances-request + // | subnet | volume | vpc | vpc-peering-connection | vpn-connection | vpn-gateway). // - // * resource-type - The resource type (customer-gateway | dhcp-options | - // elastic-ip | fleet | fpga-image | image | instance | internet-gateway - // | launch-template | natgateway | network-acl | network-interface | reserved-instances - // | route-table | security-group | snapshot | spot-instances-request | subnet - // | volume | vpc | vpc-peering-connection | vpn-connection | vpn-gateway). + // * tag: - The key/value combination of the tag. For example, specify + // "tag:Owner" for the filter name and "TeamA" for the filter value to find + // resources with the tag "Owner=TeamA". // // * value - The tag value. Filters []*Filter `locationName:"Filter" locationNameList:"Filter" type:"list"` @@ -41837,7 +41865,6 @@ func (s *DescribeTagsInput) SetNextToken(v string) *DescribeTagsInput { return s } -// Contains the output of DescribeTags. type DescribeTagsOutput struct { _ struct{} `type:"structure"` @@ -41845,7 +41872,7 @@ type DescribeTagsOutput struct { // when there are no more results to return. NextToken *string `locationName:"nextToken" type:"string"` - // A list of tags. + // The tags. Tags []*TagDescription `locationName:"tagSet" locationNameList:"item" type:"list"` } @@ -42366,7 +42393,6 @@ func (s *DescribeVolumesOutput) SetVolumes(v []*Volume) *DescribeVolumesOutput { return s } -// Contains the parameters for DescribeVpcAttribute. type DescribeVpcAttributeInput struct { _ struct{} `type:"structure"` @@ -42431,7 +42457,6 @@ func (s *DescribeVpcAttributeInput) SetVpcId(v string) *DescribeVpcAttributeInpu return s } -// Contains the output of DescribeVpcAttribute. type DescribeVpcAttributeOutput struct { _ struct{} `type:"structure"` @@ -42477,7 +42502,6 @@ func (s *DescribeVpcAttributeOutput) SetVpcId(v string) *DescribeVpcAttributeOut return s } -// Contains the parameters for DescribeVpcClassicLinkDnsSupport. type DescribeVpcClassicLinkDnsSupportInput struct { _ struct{} `type:"structure"` @@ -42538,7 +42562,6 @@ func (s *DescribeVpcClassicLinkDnsSupportInput) SetVpcIds(v []*string) *Describe return s } -// Contains the output of DescribeVpcClassicLinkDnsSupport. type DescribeVpcClassicLinkDnsSupportOutput struct { _ struct{} `type:"structure"` @@ -42571,7 +42594,6 @@ func (s *DescribeVpcClassicLinkDnsSupportOutput) SetVpcs(v []*ClassicLinkDnsSupp return s } -// Contains the parameters for DescribeVpcClassicLink. type DescribeVpcClassicLinkInput struct { _ struct{} `type:"structure"` @@ -42629,7 +42651,6 @@ func (s *DescribeVpcClassicLinkInput) SetVpcIds(v []*string) *DescribeVpcClassic return s } -// Contains the output of DescribeVpcClassicLink. type DescribeVpcClassicLinkOutput struct { _ struct{} `type:"structure"` @@ -43310,7 +43331,6 @@ func (s *DescribeVpcEndpointsOutput) SetVpcEndpoints(v []*VpcEndpoint) *Describe return s } -// Contains the parameters for DescribeVpcPeeringConnections. type DescribeVpcPeeringConnectionsInput struct { _ struct{} `type:"structure"` @@ -43392,7 +43412,6 @@ func (s *DescribeVpcPeeringConnectionsInput) SetVpcPeeringConnectionIds(v []*str return s } -// Contains the output of DescribeVpcPeeringConnections. type DescribeVpcPeeringConnectionsOutput struct { _ struct{} `type:"structure"` @@ -43416,7 +43435,6 @@ func (s *DescribeVpcPeeringConnectionsOutput) SetVpcPeeringConnections(v []*VpcP return s } -// Contains the parameters for DescribeVpcs. type DescribeVpcsInput struct { _ struct{} `type:"structure"` @@ -43504,7 +43522,6 @@ func (s *DescribeVpcsInput) SetVpcIds(v []*string) *DescribeVpcsInput { return s } -// Contains the output of DescribeVpcs. type DescribeVpcsOutput struct { _ struct{} `type:"structure"` @@ -43736,7 +43753,6 @@ func (s *DescribeVpnGatewaysOutput) SetVpnGateways(v []*VpnGateway) *DescribeVpn return s } -// Contains the parameters for DetachClassicLinkVpc. type DetachClassicLinkVpcInput struct { _ struct{} `type:"structure"` @@ -43801,7 +43817,6 @@ func (s *DetachClassicLinkVpcInput) SetVpcId(v string) *DetachClassicLinkVpcInpu return s } -// Contains the output of DetachClassicLinkVpc. type DetachClassicLinkVpcOutput struct { _ struct{} `type:"structure"` @@ -43825,7 +43840,6 @@ func (s *DetachClassicLinkVpcOutput) SetReturn(v bool) *DetachClassicLinkVpcOutp return s } -// Contains the parameters for DetachInternetGateway. type DetachInternetGatewayInput struct { _ struct{} `type:"structure"` @@ -44283,7 +44297,6 @@ func (s DisableVgwRoutePropagationOutput) GoString() string { return s.String() } -// Contains the parameters for DisableVpcClassicLinkDnsSupport. type DisableVpcClassicLinkDnsSupportInput struct { _ struct{} `type:"structure"` @@ -44307,7 +44320,6 @@ func (s *DisableVpcClassicLinkDnsSupportInput) SetVpcId(v string) *DisableVpcCla return s } -// Contains the output of DisableVpcClassicLinkDnsSupport. type DisableVpcClassicLinkDnsSupportOutput struct { _ struct{} `type:"structure"` @@ -44331,7 +44343,6 @@ func (s *DisableVpcClassicLinkDnsSupportOutput) SetReturn(v bool) *DisableVpcCla return s } -// Contains the parameters for DisableVpcClassicLink. type DisableVpcClassicLinkInput struct { _ struct{} `type:"structure"` @@ -44382,7 +44393,6 @@ func (s *DisableVpcClassicLinkInput) SetVpcId(v string) *DisableVpcClassicLinkIn return s } -// Contains the output of DisableVpcClassicLink. type DisableVpcClassicLinkOutput struct { _ struct{} `type:"structure"` @@ -44526,7 +44536,6 @@ func (s *DisassociateIamInstanceProfileOutput) SetIamInstanceProfileAssociation( return s } -// Contains the parameters for DisassociateRouteTable. type DisassociateRouteTableInput struct { _ struct{} `type:"structure"` @@ -45568,7 +45577,6 @@ func (s EnableVolumeIOOutput) GoString() string { return s.String() } -// Contains the parameters for EnableVpcClassicLinkDnsSupport. type EnableVpcClassicLinkDnsSupportInput struct { _ struct{} `type:"structure"` @@ -45592,7 +45600,6 @@ func (s *EnableVpcClassicLinkDnsSupportInput) SetVpcId(v string) *EnableVpcClass return s } -// Contains the output of EnableVpcClassicLinkDnsSupport. type EnableVpcClassicLinkDnsSupportOutput struct { _ struct{} `type:"structure"` @@ -45616,7 +45623,6 @@ func (s *EnableVpcClassicLinkDnsSupportOutput) SetReturn(v bool) *EnableVpcClass return s } -// Contains the parameters for EnableVpcClassicLink. type EnableVpcClassicLinkInput struct { _ struct{} `type:"structure"` @@ -45667,7 +45673,6 @@ func (s *EnableVpcClassicLinkInput) SetVpcId(v string) *EnableVpcClassicLinkInpu return s } -// Contains the output of EnableVpcClassicLink. type EnableVpcClassicLinkOutput struct { _ struct{} `type:"structure"` @@ -46473,8 +46478,7 @@ type FleetLaunchTemplateSpecification struct { // or a template ID. LaunchTemplateName *string `locationName:"launchTemplateName" min:"3" type:"string"` - // The version number. By default, the default version of the launch template - // is used. + // The version number of the launch template. You must specify a version number. Version *string `locationName:"version" type:"string"` } @@ -49372,7 +49376,6 @@ func (s *ImportInstanceVolumeDetailItem) SetVolume(v *DiskImageVolumeDescription return s } -// Contains the parameters for ImportKeyPair. type ImportKeyPairInput struct { _ struct{} `type:"structure"` @@ -49440,7 +49443,6 @@ func (s *ImportKeyPairInput) SetPublicKeyMaterial(v []byte) *ImportKeyPairInput return s } -// Contains the output of ImportKeyPair. type ImportKeyPairOutput struct { _ struct{} `type:"structure"` @@ -50369,7 +50371,7 @@ func (s *InstanceCount) SetState(v string) *InstanceCount { return s } -// Describes the credit option for CPU usage of a T2 instance. +// Describes the credit option for CPU usage of a T2 or T3 instance. type InstanceCreditSpecification struct { _ struct{} `type:"structure"` @@ -50403,7 +50405,7 @@ func (s *InstanceCreditSpecification) SetInstanceId(v string) *InstanceCreditSpe return s } -// Describes the credit option for CPU usage of a T2 instance. +// Describes the credit option for CPU usage of a T2 or T3 instance. type InstanceCreditSpecificationRequest struct { _ struct{} `type:"structure"` @@ -51432,11 +51434,9 @@ type IpPermission struct { // [EC2-VPC only] One or more IPv6 ranges. Ipv6Ranges []*Ipv6Range `locationName:"ipv6Ranges" locationNameList:"item" type:"list"` - // (EC2-VPC only; valid for AuthorizeSecurityGroupEgress, RevokeSecurityGroupEgress - // and DescribeSecurityGroups only) One or more prefix list IDs for an AWS service. - // In an AuthorizeSecurityGroupEgress request, this is the AWS service that - // you want to access through a VPC endpoint from instances associated with - // the security group. + // [EC2-VPC only] One or more prefix list IDs for an AWS service. With AuthorizeSecurityGroupEgress, + // this is the AWS service that you want to access through a VPC endpoint from + // instances associated with the security group. PrefixListIds []*PrefixListId `locationName:"prefixListIds" locationNameList:"item" type:"list"` // The end of port range for the TCP and UDP protocols, or an ICMP/ICMPv6 code. @@ -53719,7 +53719,6 @@ func (s *ModifyFpgaImageAttributeOutput) SetFpgaImageAttribute(v *FpgaImageAttri return s } -// Contains the parameters for ModifyHosts. type ModifyHostsInput struct { _ struct{} `type:"structure"` @@ -53772,7 +53771,6 @@ func (s *ModifyHostsInput) SetHostIds(v []*string) *ModifyHostsInput { return s } -// Contains the output of ModifyHosts. type ModifyHostsOutput struct { _ struct{} `type:"structure"` @@ -54442,7 +54440,6 @@ func (s *ModifyInstanceCreditSpecificationOutput) SetUnsuccessfulInstanceCreditS return s } -// Contains the parameters for ModifyInstancePlacement. type ModifyInstancePlacementInput struct { _ struct{} `type:"structure"` @@ -54521,7 +54518,6 @@ func (s *ModifyInstancePlacementInput) SetTenancy(v string) *ModifyInstancePlace return s } -// Contains the output of ModifyInstancePlacement. type ModifyInstancePlacementOutput struct { _ struct{} `type:"structure"` @@ -55036,7 +55032,6 @@ func (s *ModifySpotFleetRequestOutput) SetReturn(v bool) *ModifySpotFleetRequest return s } -// Contains the parameters for ModifySubnetAttribute. type ModifySubnetAttributeInput struct { _ struct{} `type:"structure"` @@ -55302,7 +55297,6 @@ func (s *ModifyVolumeOutput) SetVolumeModification(v *VolumeModification) *Modif return s } -// Contains the parameters for ModifyVpcAttribute. type ModifyVpcAttributeInput struct { _ struct{} `type:"structure"` @@ -55839,7 +55833,7 @@ type ModifyVpcPeeringConnectionOptionsInput struct { // The VPC peering connection options for the accepter VPC. AccepterPeeringConnectionOptions *PeeringConnectionOptionsRequest `type:"structure"` - // Checks whether you have the required permissions for the operation, without + // Checks whether you have the required permissions for the action, without // actually making the request, and provides an error response. If you have // the required permissions, the error response is DryRunOperation. Otherwise, // it is UnauthorizedOperation. @@ -55933,11 +55927,10 @@ func (s *ModifyVpcPeeringConnectionOptionsOutput) SetRequesterPeeringConnectionO return s } -// Contains the parameters for ModifyVpcTenancy. type ModifyVpcTenancyInput struct { _ struct{} `type:"structure"` - // Checks whether you have the required permissions for the operation, without + // Checks whether you have the required permissions for the action, without // actually making the request, and provides an error response. If you have // the required permissions, the error response is DryRunOperation. Otherwise, // it is UnauthorizedOperation. @@ -55998,7 +55991,6 @@ func (s *ModifyVpcTenancyInput) SetVpcId(v string) *ModifyVpcTenancyInput { return s } -// Contains the output of ModifyVpcTenancy. type ModifyVpcTenancyOutput struct { _ struct{} `type:"structure"` @@ -57342,11 +57334,11 @@ type PeeringConnectionOptions struct { AllowDnsResolutionFromRemoteVpc *bool `locationName:"allowDnsResolutionFromRemoteVpc" type:"boolean"` // If true, enables outbound communication from an EC2-Classic instance that's - // linked to a local VPC via ClassicLink to instances in a peer VPC. + // linked to a local VPC using ClassicLink to instances in a peer VPC. AllowEgressFromLocalClassicLinkToRemoteVpc *bool `locationName:"allowEgressFromLocalClassicLinkToRemoteVpc" type:"boolean"` // If true, enables outbound communication from instances in a local VPC to - // an EC2-Classic instance that's linked to a peer VPC via ClassicLink. + // an EC2-Classic instance that's linked to a peer VPC using ClassicLink. AllowEgressFromLocalVpcToRemoteClassicLink *bool `locationName:"allowEgressFromLocalVpcToRemoteClassicLink" type:"boolean"` } @@ -57387,11 +57379,11 @@ type PeeringConnectionOptionsRequest struct { AllowDnsResolutionFromRemoteVpc *bool `type:"boolean"` // If true, enables outbound communication from an EC2-Classic instance that's - // linked to a local VPC via ClassicLink to instances in a peer VPC. + // linked to a local VPC using ClassicLink to instances in a peer VPC. AllowEgressFromLocalClassicLinkToRemoteVpc *bool `type:"boolean"` // If true, enables outbound communication from instances in a local VPC to - // an EC2-Classic instance that's linked to a peer VPC via ClassicLink. + // an EC2-Classic instance that's linked to a peer VPC using ClassicLink. AllowEgressFromLocalVpcToRemoteClassicLink *bool `type:"boolean"` } @@ -57613,7 +57605,7 @@ func (s *PrefixList) SetPrefixListName(v string) *PrefixList { return s } -// [EC2-VPC only] The ID of the prefix. +// Describes a prefix list ID. type PrefixListId struct { _ struct{} `type:"structure"` @@ -58888,7 +58880,6 @@ func (s *RejectVpcEndpointConnectionsOutput) SetUnsuccessful(v []*UnsuccessfulIt return s } -// Contains the parameters for RejectVpcPeeringConnection. type RejectVpcPeeringConnectionInput struct { _ struct{} `type:"structure"` @@ -58939,7 +58930,6 @@ func (s *RejectVpcPeeringConnectionInput) SetVpcPeeringConnectionId(v string) *R return s } -// Contains the output of RejectVpcPeeringConnection. type RejectVpcPeeringConnectionOutput struct { _ struct{} `type:"structure"` @@ -59022,7 +59012,6 @@ func (s ReleaseAddressOutput) GoString() string { return s.String() } -// Contains the parameters for ReleaseHosts. type ReleaseHostsInput struct { _ struct{} `type:"structure"` @@ -59061,7 +59050,6 @@ func (s *ReleaseHostsInput) SetHostIds(v []*string) *ReleaseHostsInput { return s } -// Contains the output of ReleaseHosts. type ReleaseHostsOutput struct { _ struct{} `type:"structure"` @@ -59170,7 +59158,6 @@ func (s *ReplaceIamInstanceProfileAssociationOutput) SetIamInstanceProfileAssoci return s } -// Contains the parameters for ReplaceNetworkAclAssociation. type ReplaceNetworkAclAssociationInput struct { _ struct{} `type:"structure"` @@ -59236,7 +59223,6 @@ func (s *ReplaceNetworkAclAssociationInput) SetNetworkAclId(v string) *ReplaceNe return s } -// Contains the output of ReplaceNetworkAclAssociation. type ReplaceNetworkAclAssociationOutput struct { _ struct{} `type:"structure"` @@ -59260,7 +59246,6 @@ func (s *ReplaceNetworkAclAssociationOutput) SetNewAssociationId(v string) *Repl return s } -// Contains the parameters for ReplaceNetworkAclEntry. type ReplaceNetworkAclEntryInput struct { _ struct{} `type:"structure"` @@ -59427,7 +59412,6 @@ func (s ReplaceNetworkAclEntryOutput) GoString() string { return s.String() } -// Contains the parameters for ReplaceRoute. type ReplaceRouteInput struct { _ struct{} `type:"structure"` @@ -59566,7 +59550,6 @@ func (s ReplaceRouteOutput) GoString() string { return s.String() } -// Contains the parameters for ReplaceRouteTableAssociation. type ReplaceRouteTableAssociationInput struct { _ struct{} `type:"structure"` @@ -59631,7 +59614,6 @@ func (s *ReplaceRouteTableAssociationInput) SetRouteTableId(v string) *ReplaceRo return s } -// Contains the output of ReplaceRouteTableAssociation. type ReplaceRouteTableAssociationOutput struct { _ struct{} `type:"structure"` @@ -59814,7 +59796,8 @@ type RequestLaunchTemplateData struct { // in the Amazon Elastic Compute Cloud User Guide. CpuOptions *LaunchTemplateCpuOptionsRequest `type:"structure"` - // The credit option for CPU usage of the instance. Valid for T2 instances only. + // The credit option for CPU usage of the instance. Valid for T2 or T3 instances + // only. CreditSpecification *CreditSpecificationRequest `type:"structure"` // If set to true, you can't terminate the instance using the Amazon EC2 console, @@ -62103,7 +62086,6 @@ func (s *RestoreAddressToClassicOutput) SetStatus(v string) *RestoreAddressToCla return s } -// Contains the parameters for RevokeSecurityGroupEgress. type RevokeSecurityGroupEgressInput struct { _ struct{} `type:"structure"` @@ -62235,7 +62217,6 @@ func (s RevokeSecurityGroupEgressOutput) GoString() string { return s.String() } -// Contains the parameters for RevokeSecurityGroupIngress. type RevokeSecurityGroupIngressInput struct { _ struct{} `type:"structure"` @@ -62653,10 +62634,10 @@ type RunInstancesInput struct { // The credit option for CPU usage of the instance. Valid values are standard // and unlimited. To change this attribute after launch, use ModifyInstanceCreditSpecification. - // For more information, see T2 Instances (http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/t2-instances.html) + // For more information, see Burstable Performance Instances (http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/burstable-performance-instances.html) // in the Amazon Elastic Compute Cloud User Guide. // - // Default: standard + // Default: standard (T2 instances) or unlimited (T3 instances) CreditSpecification *CreditSpecificationRequest `type:"structure"` // If you set this parameter to true, you can't terminate the instance using @@ -67005,7 +66986,7 @@ func (s *SubnetIpv6CidrBlockAssociation) SetIpv6CidrBlockState(v *SubnetCidrBloc return s } -// Describes the T2 instance whose credit option for CPU usage was successfully +// Describes the T2 or T3 instance whose credit option for CPU usage was successfully // modified. type SuccessfulInstanceCreditSpecificationItem struct { _ struct{} `type:"structure"` @@ -67037,7 +67018,7 @@ type Tag struct { // The key of the tag. // // Constraints: Tag keys are case-sensitive and accept a maximum of 127 Unicode - // characters. May not begin with aws: + // characters. May not begin with aws:. Key *string `locationName:"key" type:"string"` // The value of the tag. @@ -67125,8 +67106,8 @@ type TagSpecification struct { _ struct{} `type:"structure"` // The type of resource to tag. Currently, the resource types that support tagging - // on creation are fleet, instance, snapshot, and volume. To tag a resource - // after it has been created, see CreateTags. + // on creation are fleet, dedicated-host, instance, snapshot, and volume. To + // tag a resource after it has been created, see CreateTags. ResourceType *string `locationName:"resourceType" type:"string" enum:"ResourceType"` // The tags to apply to the resource. @@ -67796,12 +67777,13 @@ func (s *UnmonitorInstancesOutput) SetInstanceMonitorings(v []*InstanceMonitorin return s } -// Describes the T2 instance whose credit option for CPU usage was not modified. +// Describes the T2 or T3 instance whose credit option for CPU usage was not +// modified. type UnsuccessfulInstanceCreditSpecificationItem struct { _ struct{} `type:"structure"` - // The applicable error for the T2 instance whose credit option for CPU usage - // was not modified. + // The applicable error for the T2 or T3 instance whose credit option for CPU + // usage was not modified. Error *UnsuccessfulInstanceCreditSpecificationItemError `locationName:"error" type:"structure"` // The ID of the instance. @@ -67830,8 +67812,8 @@ func (s *UnsuccessfulInstanceCreditSpecificationItem) SetInstanceId(v string) *U return s } -// Information about the error for the T2 instance whose credit option for CPU -// usage was not modified. +// Information about the error for the T2 or T3 instance whose credit option +// for CPU usage was not modified. type UnsuccessfulInstanceCreditSpecificationItemError struct { _ struct{} `type:"structure"` @@ -67937,7 +67919,6 @@ func (s *UnsuccessfulItemError) SetMessage(v string) *UnsuccessfulItemError { return s } -// Contains the parameters for UpdateSecurityGroupRuleDescriptionsEgress. type UpdateSecurityGroupRuleDescriptionsEgressInput struct { _ struct{} `type:"structure"` @@ -68009,7 +67990,6 @@ func (s *UpdateSecurityGroupRuleDescriptionsEgressInput) SetIpPermissions(v []*I return s } -// Contains the output of UpdateSecurityGroupRuleDescriptionsEgress. type UpdateSecurityGroupRuleDescriptionsEgressOutput struct { _ struct{} `type:"structure"` @@ -68033,7 +68013,6 @@ func (s *UpdateSecurityGroupRuleDescriptionsEgressOutput) SetReturn(v bool) *Upd return s } -// Contains the parameters for UpdateSecurityGroupRuleDescriptionsIngress. type UpdateSecurityGroupRuleDescriptionsIngressInput struct { _ struct{} `type:"structure"` @@ -68105,7 +68084,6 @@ func (s *UpdateSecurityGroupRuleDescriptionsIngressInput) SetIpPermissions(v []* return s } -// Contains the output of UpdateSecurityGroupRuleDescriptionsIngress. type UpdateSecurityGroupRuleDescriptionsIngressOutput struct { _ struct{} `type:"structure"` @@ -71517,6 +71495,9 @@ const ( // ResourceTypeCustomerGateway is a ResourceType enum value ResourceTypeCustomerGateway = "customer-gateway" + // ResourceTypeDedicatedHost is a ResourceType enum value + ResourceTypeDedicatedHost = "dedicated-host" + // ResourceTypeDhcpOptions is a ResourceType enum value ResourceTypeDhcpOptions = "dhcp-options" diff --git a/vendor/github.com/aws/aws-sdk-go/service/ecs/api.go b/vendor/github.com/aws/aws-sdk-go/service/ecs/api.go index 9b577324895..5060627b0b5 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/ecs/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/ecs/api.go @@ -3777,7 +3777,7 @@ type AwsVpcConfiguration struct { // All specified security groups must be from the same VPC. SecurityGroups []*string `locationName:"securityGroups" type:"list"` - // The subnets associated with the task or service. There is a limit of 10 subnets + // The subnets associated with the task or service. There is a limit of 16 subnets // able to be specified per AwsVpcConfiguration. // // All specified subnets must be from the same VPC. @@ -4045,7 +4045,7 @@ type ContainerDefinition struct { _ struct{} `type:"structure"` // The command that is passed to the container. This parameter maps to Cmd in - // the Create a container (https://docs.docker.com/engine/api/v1.35/#create-a-container) + // the Create a container (https://docs.docker.com/engine/api/v1.35/#operation/ContainerCreate) // section of the Docker Remote API (https://docs.docker.com/engine/api/v1.35/) // and the COMMAND parameter to docker run (https://docs.docker.com/engine/reference/run/). // For more information, see https://docs.docker.com/engine/reference/builder/#cmd @@ -4053,7 +4053,7 @@ type ContainerDefinition struct { Command []*string `locationName:"command" type:"list"` // The number of cpu units reserved for the container. This parameter maps to - // CpuShares in the Create a container (https://docs.docker.com/engine/api/v1.35/#create-a-container) + // CpuShares in the Create a container (https://docs.docker.com/engine/api/v1.35/#operation/ContainerCreate) // section of the Docker Remote API (https://docs.docker.com/engine/api/v1.35/) // and the --cpu-shares option to docker run (https://docs.docker.com/engine/reference/run/). // @@ -4109,14 +4109,14 @@ type ContainerDefinition struct { Cpu *int64 `locationName:"cpu" type:"integer"` // When this parameter is true, networking is disabled within the container. - // This parameter maps to NetworkDisabled in the Create a container (https://docs.docker.com/engine/api/v1.35/#create-a-container) + // This parameter maps to NetworkDisabled in the Create a container (https://docs.docker.com/engine/api/v1.35/#operation/ContainerCreate) // section of the Docker Remote API (https://docs.docker.com/engine/api/v1.35/). // // This parameter is not supported for Windows containers. DisableNetworking *bool `locationName:"disableNetworking" type:"boolean"` // A list of DNS search domains that are presented to the container. This parameter - // maps to DnsSearch in the Create a container (https://docs.docker.com/engine/api/v1.35/#create-a-container) + // maps to DnsSearch in the Create a container (https://docs.docker.com/engine/api/v1.35/#operation/ContainerCreate) // section of the Docker Remote API (https://docs.docker.com/engine/api/v1.35/) // and the --dns-search option to docker run (https://docs.docker.com/engine/reference/run/). // @@ -4124,7 +4124,7 @@ type ContainerDefinition struct { DnsSearchDomains []*string `locationName:"dnsSearchDomains" type:"list"` // A list of DNS servers that are presented to the container. This parameter - // maps to Dns in the Create a container (https://docs.docker.com/engine/api/v1.35/#create-a-container) + // maps to Dns in the Create a container (https://docs.docker.com/engine/api/v1.35/#operation/ContainerCreate) // section of the Docker Remote API (https://docs.docker.com/engine/api/v1.35/) // and the --dns option to docker run (https://docs.docker.com/engine/reference/run/). // @@ -4132,7 +4132,7 @@ type ContainerDefinition struct { DnsServers []*string `locationName:"dnsServers" type:"list"` // A key/value map of labels to add to the container. This parameter maps to - // Labels in the Create a container (https://docs.docker.com/engine/api/v1.35/#create-a-container) + // Labels in the Create a container (https://docs.docker.com/engine/api/v1.35/#operation/ContainerCreate) // section of the Docker Remote API (https://docs.docker.com/engine/api/v1.35/) // and the --label option to docker run (https://docs.docker.com/engine/reference/run/). // This parameter requires version 1.18 of the Docker Remote API or greater @@ -4145,7 +4145,7 @@ type ContainerDefinition struct { // security systems. This field is not valid for containers in tasks using the // Fargate launch type. // - // This parameter maps to SecurityOpt in the Create a container (https://docs.docker.com/engine/api/v1.35/#create-a-container) + // This parameter maps to SecurityOpt in the Create a container (https://docs.docker.com/engine/api/v1.35/#operation/ContainerCreate) // section of the Docker Remote API (https://docs.docker.com/engine/api/v1.35/) // and the --security-opt option to docker run (https://docs.docker.com/engine/reference/run/). // @@ -4164,7 +4164,7 @@ type ContainerDefinition struct { // agent or enter your commands and arguments as command array items instead. // // The entry point that is passed to the container. This parameter maps to Entrypoint - // in the Create a container (https://docs.docker.com/engine/api/v1.35/#create-a-container) + // in the Create a container (https://docs.docker.com/engine/api/v1.35/#operation/ContainerCreate) // section of the Docker Remote API (https://docs.docker.com/engine/api/v1.35/) // and the --entrypoint option to docker run (https://docs.docker.com/engine/reference/run/). // For more information, see https://docs.docker.com/engine/reference/builder/#entrypoint @@ -4172,7 +4172,7 @@ type ContainerDefinition struct { EntryPoint []*string `locationName:"entryPoint" type:"list"` // The environment variables to pass to a container. This parameter maps to - // Env in the Create a container (https://docs.docker.com/engine/api/v1.35/#create-a-container) + // Env in the Create a container (https://docs.docker.com/engine/api/v1.35/#operation/ContainerCreate) // section of the Docker Remote API (https://docs.docker.com/engine/api/v1.35/) // and the --env option to docker run (https://docs.docker.com/engine/reference/run/). // @@ -4197,7 +4197,7 @@ type ContainerDefinition struct { // A list of hostnames and IP address mappings to append to the /etc/hosts file // on the container. If using the Fargate launch type, this may be used to list // non-Fargate hosts to which the container can talk. This parameter maps to - // ExtraHosts in the Create a container (https://docs.docker.com/engine/api/v1.35/#create-a-container) + // ExtraHosts in the Create a container (https://docs.docker.com/engine/api/v1.35/#operation/ContainerCreate) // section of the Docker Remote API (https://docs.docker.com/engine/api/v1.35/) // and the --add-host option to docker run (https://docs.docker.com/engine/reference/run/). // @@ -4205,13 +4205,13 @@ type ContainerDefinition struct { ExtraHosts []*HostEntry `locationName:"extraHosts" type:"list"` // The health check command and associated configuration parameters for the - // container. This parameter maps to HealthCheck in the Create a container (https://docs.docker.com/engine/api/v1.35/#create-a-container) + // container. This parameter maps to HealthCheck in the Create a container (https://docs.docker.com/engine/api/v1.35/#operation/ContainerCreate) // section of the Docker Remote API (https://docs.docker.com/engine/api/v1.35/) // and the HEALTHCHECK parameter of docker run (https://docs.docker.com/engine/reference/run/). HealthCheck *HealthCheck `locationName:"healthCheck" type:"structure"` // The hostname to use for your container. This parameter maps to Hostname in - // the Create a container (https://docs.docker.com/engine/api/v1.35/#create-a-container) + // the Create a container (https://docs.docker.com/engine/api/v1.35/#operation/ContainerCreate) // section of the Docker Remote API (https://docs.docker.com/engine/api/v1.35/) // and the --hostname option to docker run (https://docs.docker.com/engine/reference/run/). // @@ -4224,9 +4224,9 @@ type ContainerDefinition struct { // repository-url/image@digest. Up to 255 letters (uppercase and lowercase), // numbers, hyphens, underscores, colons, periods, forward slashes, and number // signs are allowed. This parameter maps to Image in the Create a container - // (https://docs.docker.com/engine/api/v1.35/#create-a-container) section of - // the Docker Remote API (https://docs.docker.com/engine/api/v1.35/) and the - // IMAGE parameter of docker run (https://docs.docker.com/engine/reference/run/). + // (https://docs.docker.com/engine/api/v1.35/#operation/ContainerCreate) section + // of the Docker Remote API (https://docs.docker.com/engine/api/v1.35/) and + // the IMAGE parameter of docker run (https://docs.docker.com/engine/reference/run/). // // * When a new task starts, the Amazon ECS container agent pulls the latest // version of the specified image and tag for the container to use. However, @@ -4249,6 +4249,13 @@ type ContainerDefinition struct { // name (for example, quay.io/assemblyline/ubuntu). Image *string `locationName:"image" type:"string"` + // When this parameter is true, this allows you to deploy containerized applications + // that require stdin or a tty to be allocated. This parameter maps to OpenStdin + // in the Create a container (https://docs.docker.com/engine/api/v1.35/#operation/ContainerCreate) + // section of the Docker Remote API (https://docs.docker.com/engine/api/v1.35/) + // and the --interactive option to docker run (https://docs.docker.com/engine/reference/run/). + Interactive *bool `locationName:"interactive" type:"boolean"` + // The link parameter allows containers to communicate with each other without // the need for port mappings. Only supported if the network mode of a task // definition is set to bridge. The name:internalName construct is analogous @@ -4256,7 +4263,7 @@ type ContainerDefinition struct { // numbers, hyphens, and underscores are allowed. For more information about // linking Docker containers, go to https://docs.docker.com/engine/userguide/networking/default_network/dockerlinks/ // (https://docs.docker.com/engine/userguide/networking/default_network/dockerlinks/). - // This parameter maps to Links in the Create a container (https://docs.docker.com/engine/api/v1.35/#create-a-container) + // This parameter maps to Links in the Create a container (https://docs.docker.com/engine/api/v1.35/#operation/ContainerCreate) // section of the Docker Remote API (https://docs.docker.com/engine/api/v1.35/) // and the --link option to docker run (https://docs.docker.com/engine/reference/commandline/run/). // @@ -4278,7 +4285,7 @@ type ContainerDefinition struct { // // If using the Fargate launch type, the only supported value is awslogs. // - // This parameter maps to LogConfig in the Create a container (https://docs.docker.com/engine/api/v1.35/#create-a-container) + // This parameter maps to LogConfig in the Create a container (https://docs.docker.com/engine/api/v1.35/#operation/ContainerCreate) // section of the Docker Remote API (https://docs.docker.com/engine/api/v1.35/) // and the --log-driver option to docker run (https://docs.docker.com/engine/reference/run/). // By default, containers use the same logging driver that the Docker daemon @@ -4309,7 +4316,7 @@ type ContainerDefinition struct { // The hard limit (in MiB) of memory to present to the container. If your container // attempts to exceed the memory specified here, the container is killed. This - // parameter maps to Memory in the Create a container (https://docs.docker.com/engine/api/v1.35/#create-a-container) + // parameter maps to Memory in the Create a container (https://docs.docker.com/engine/api/v1.35/#operation/ContainerCreate) // section of the Docker Remote API (https://docs.docker.com/engine/api/v1.35/) // and the --memory option to docker run (https://docs.docker.com/engine/reference/run/). // @@ -4334,7 +4341,7 @@ type ContainerDefinition struct { // it needs to, up to either the hard limit specified with the memory parameter // (if applicable), or all of the available memory on the container instance, // whichever comes first. This parameter maps to MemoryReservation in the Create - // a container (https://docs.docker.com/engine/api/v1.35/#create-a-container) + // a container (https://docs.docker.com/engine/api/v1.35/#operation/ContainerCreate) // section of the Docker Remote API (https://docs.docker.com/engine/api/v1.35/) // and the --memory-reservation option to docker run (https://docs.docker.com/engine/reference/run/). // @@ -4357,7 +4364,7 @@ type ContainerDefinition struct { // The mount points for data volumes in your container. // - // This parameter maps to Volumes in the Create a container (https://docs.docker.com/engine/api/v1.35/#create-a-container) + // This parameter maps to Volumes in the Create a container (https://docs.docker.com/engine/api/v1.35/#operation/ContainerCreate) // section of the Docker Remote API (https://docs.docker.com/engine/api/v1.35/) // and the --volume option to docker run (https://docs.docker.com/engine/reference/run/). // @@ -4370,7 +4377,7 @@ type ContainerDefinition struct { // in a task definition, the name of one container can be entered in the links // of another container to connect the containers. Up to 255 letters (uppercase // and lowercase), numbers, hyphens, and underscores are allowed. This parameter - // maps to name in the Create a container (https://docs.docker.com/engine/api/v1.35/#create-a-container) + // maps to name in the Create a container (https://docs.docker.com/engine/api/v1.35/#operation/ContainerCreate) // section of the Docker Remote API (https://docs.docker.com/engine/api/v1.35/) // and the --name option to docker run (https://docs.docker.com/engine/reference/run/). Name *string `locationName:"name" type:"string"` @@ -4386,7 +4393,7 @@ type ContainerDefinition struct { // There is no loopback for port mappings on Windows, so you cannot access a // container's mapped port from the host itself. // - // This parameter maps to PortBindings in the Create a container (https://docs.docker.com/engine/api/v1.35/#create-a-container) + // This parameter maps to PortBindings in the Create a container (https://docs.docker.com/engine/api/v1.35/#operation/ContainerCreate) // section of the Docker Remote API (https://docs.docker.com/engine/api/v1.35/) // and the --publish option to docker run (https://docs.docker.com/engine/reference/run/). // If the network mode of a task definition is set to none, then you can't specify @@ -4402,7 +4409,7 @@ type ContainerDefinition struct { // When this parameter is true, the container is given elevated privileges on // the host container instance (similar to the root user). This parameter maps - // to Privileged in the Create a container (https://docs.docker.com/engine/api/v1.35/#create-a-container) + // to Privileged in the Create a container (https://docs.docker.com/engine/api/v1.35/#operation/ContainerCreate) // section of the Docker Remote API (https://docs.docker.com/engine/api/v1.35/) // and the --privileged option to docker run (https://docs.docker.com/engine/reference/run/). // @@ -4410,11 +4417,17 @@ type ContainerDefinition struct { // Fargate launch type. Privileged *bool `locationName:"privileged" type:"boolean"` + // When this parameter is true, a TTY is allocated. This parameter maps to Tty + // in the Create a container (https://docs.docker.com/engine/api/v1.35/#operation/ContainerCreate) + // section of the Docker Remote API (https://docs.docker.com/engine/api/v1.35/) + // and the --tty option to docker run (https://docs.docker.com/engine/reference/run/). + PseudoTerminal *bool `locationName:"pseudoTerminal" type:"boolean"` + // When this parameter is true, the container is given read-only access to its // root file system. This parameter maps to ReadonlyRootfs in the Create a container - // (https://docs.docker.com/engine/api/v1.35/#create-a-container) section of - // the Docker Remote API (https://docs.docker.com/engine/api/v1.35/) and the - // --read-only option to docker run. + // (https://docs.docker.com/engine/api/v1.35/#operation/ContainerCreate) section + // of the Docker Remote API (https://docs.docker.com/engine/api/v1.35/) and + // the --read-only option to docker run (https://docs.docker.com/engine/reference/run/). // // This parameter is not supported for Windows containers. ReadonlyRootFilesystem *bool `locationName:"readonlyRootFilesystem" type:"boolean"` @@ -4422,8 +4435,19 @@ type ContainerDefinition struct { // The private repository authentication credentials to use. RepositoryCredentials *RepositoryCredentials `locationName:"repositoryCredentials" type:"structure"` + // A list of namespaced kernel parameters to set in the container. This parameter + // maps to Sysctls in the Create a container (https://docs.docker.com/engine/api/v1.35/#operation/ContainerCreate) + // section of the Docker Remote API (https://docs.docker.com/engine/api/v1.35/) + // and the --sysctl option to docker run (https://docs.docker.com/engine/reference/run/). + // + // It is not recommended that you specify network-related systemControls parameters + // for multiple containers in a single task that also uses either the awsvpc + // or host network modes. When you do, the container that is started last will + // determine which systemControls parameters take effect. + SystemControls []*SystemControl `locationName:"systemControls" type:"list"` + // A list of ulimits to set in the container. This parameter maps to Ulimits - // in the Create a container (https://docs.docker.com/engine/api/v1.35/#create-a-container) + // in the Create a container (https://docs.docker.com/engine/api/v1.35/#operation/ContainerCreate) // section of the Docker Remote API (https://docs.docker.com/engine/api/v1.35/) // and the --ulimit option to docker run (https://docs.docker.com/engine/reference/run/). // Valid naming values are displayed in the Ulimit data type. This parameter @@ -4436,7 +4460,7 @@ type ContainerDefinition struct { Ulimits []*Ulimit `locationName:"ulimits" type:"list"` // The user name to use inside the container. This parameter maps to User in - // the Create a container (https://docs.docker.com/engine/api/v1.35/#create-a-container) + // the Create a container (https://docs.docker.com/engine/api/v1.35/#operation/ContainerCreate) // section of the Docker Remote API (https://docs.docker.com/engine/api/v1.35/) // and the --user option to docker run (https://docs.docker.com/engine/reference/run/). // @@ -4444,13 +4468,13 @@ type ContainerDefinition struct { User *string `locationName:"user" type:"string"` // Data volumes to mount from another container. This parameter maps to VolumesFrom - // in the Create a container (https://docs.docker.com/engine/api/v1.35/#create-a-container) + // in the Create a container (https://docs.docker.com/engine/api/v1.35/#operation/ContainerCreate) // section of the Docker Remote API (https://docs.docker.com/engine/api/v1.35/) // and the --volumes-from option to docker run (https://docs.docker.com/engine/reference/run/). VolumesFrom []*VolumeFrom `locationName:"volumesFrom" type:"list"` // The working directory in which to run commands inside the container. This - // parameter maps to WorkingDir in the Create a container (https://docs.docker.com/engine/api/v1.35/#create-a-container) + // parameter maps to WorkingDir in the Create a container (https://docs.docker.com/engine/api/v1.35/#operation/ContainerCreate) // section of the Docker Remote API (https://docs.docker.com/engine/api/v1.35/) // and the --workdir option to docker run (https://docs.docker.com/engine/reference/run/). WorkingDirectory *string `locationName:"workingDirectory" type:"string"` @@ -4600,6 +4624,12 @@ func (s *ContainerDefinition) SetImage(v string) *ContainerDefinition { return s } +// SetInteractive sets the Interactive field's value. +func (s *ContainerDefinition) SetInteractive(v bool) *ContainerDefinition { + s.Interactive = &v + return s +} + // SetLinks sets the Links field's value. func (s *ContainerDefinition) SetLinks(v []*string) *ContainerDefinition { s.Links = v @@ -4654,6 +4684,12 @@ func (s *ContainerDefinition) SetPrivileged(v bool) *ContainerDefinition { return s } +// SetPseudoTerminal sets the PseudoTerminal field's value. +func (s *ContainerDefinition) SetPseudoTerminal(v bool) *ContainerDefinition { + s.PseudoTerminal = &v + return s +} + // SetReadonlyRootFilesystem sets the ReadonlyRootFilesystem field's value. func (s *ContainerDefinition) SetReadonlyRootFilesystem(v bool) *ContainerDefinition { s.ReadonlyRootFilesystem = &v @@ -4666,6 +4702,12 @@ func (s *ContainerDefinition) SetRepositoryCredentials(v *RepositoryCredentials) return s } +// SetSystemControls sets the SystemControls field's value. +func (s *ContainerDefinition) SetSystemControls(v []*SystemControl) *ContainerDefinition { + s.SystemControls = v + return s +} + // SetUlimits sets the Ulimits field's value. func (s *ContainerDefinition) SetUlimits(v []*Ulimit) *ContainerDefinition { s.Ulimits = v @@ -6411,8 +6453,9 @@ func (s *DiscoverPollEndpointOutput) SetTelemetryEndpoint(v string) *DiscoverPol return s } -// The configuration for the Docker volume. This parameter is specified when -// using Docker volumes. +// This parameter is specified when using Docker volumes. Docker volumes are +// only supported when using the EC2 launch type. Windows containers only support +// the use of the local driver. To use bind mounts, specify a host instead. type DockerVolumeConfiguration struct { _ struct{} `type:"structure"` @@ -6529,6 +6572,19 @@ func (s *Failure) SetReason(v string) *Failure { // that are specified in a container definition override any Docker health checks // that exist in the container image (such as those specified in a parent image // or from the image's Dockerfile). +// +// The following are notes about container health check support: +// +// * Container health checks require version 1.17.0 or greater of the Amazon +// ECS container agent. For more information, see Updating the Amazon ECS +// Container Agent (https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-agent-update.html). +// +// * Container health checks are supported for Fargate tasks if using platform +// version version 1.1.0 or greater. For more information, see AWS Fargate +// Platform Versions (https://docs.aws.amazon.com/AmazonECS/latest/developerguide/platform_versions.html). +// +// * Container health checks are not supported for tasks that are part of +// a service that is configured to use a Classic Load Balancer. type HealthCheck struct { _ struct{} `type:"structure"` @@ -6540,7 +6596,7 @@ type HealthCheck struct { // [ "CMD-SHELL", "curl -f http://localhost/ || exit 1" ] // // An exit code of 0 indicates success, and non-zero exit code indicates failure. - // For more information, see HealthCheck in the Create a container (https://docs.docker.com/engine/api/v1.35/#create-a-container) + // For more information, see HealthCheck in the Create a container (https://docs.docker.com/engine/api/v1.35/#operation/ContainerCreate) // section of the Docker Remote API (https://docs.docker.com/engine/api/v1.35/). // // Command is a required field @@ -6724,7 +6780,7 @@ type KernelCapabilities struct { // The Linux capabilities for the container that have been added to the default // configuration provided by Docker. This parameter maps to CapAdd in the Create - // a container (https://docs.docker.com/engine/api/v1.35/#create-a-container) + // a container (https://docs.docker.com/engine/api/v1.35/#operation/ContainerCreate) // section of the Docker Remote API (https://docs.docker.com/engine/api/v1.35/) // and the --cap-add option to docker run (https://docs.docker.com/engine/reference/run/). // @@ -6743,7 +6799,7 @@ type KernelCapabilities struct { // The Linux capabilities for the container that have been removed from the // default configuration provided by Docker. This parameter maps to CapDrop - // in the Create a container (https://docs.docker.com/engine/api/v1.35/#create-a-container) + // in the Create a container (https://docs.docker.com/engine/api/v1.35/#operation/ContainerCreate) // section of the Docker Remote API (https://docs.docker.com/engine/api/v1.35/) // and the --cap-drop option to docker run (https://docs.docker.com/engine/reference/run/). // @@ -6827,7 +6883,7 @@ type LinuxParameters struct { Capabilities *KernelCapabilities `locationName:"capabilities" type:"structure"` // Any host devices to expose to the container. This parameter maps to Devices - // in the Create a container (https://docs.docker.com/engine/api/v1.35/#create-a-container) + // in the Create a container (https://docs.docker.com/engine/api/v1.35/#operation/ContainerCreate) // section of the Docker Remote API (https://docs.docker.com/engine/api/v1.35/) // and the --device option to docker run (https://docs.docker.com/engine/reference/run/). // @@ -9338,7 +9394,7 @@ type ServiceRegistry struct { ContainerPort *int64 `locationName:"containerPort" type:"integer"` // The port value used if your service discovery service specified an SRV record. - // This field is required if both the awsvpc network mode and SRV records are + // This field may be used if both the awsvpc network mode and SRV records are // used. Port *int64 `locationName:"port" type:"integer"` @@ -9865,6 +9921,47 @@ func (s *SubmitTaskStateChangeOutput) SetAcknowledgment(v string) *SubmitTaskSta return s } +// A list of namespaced kernel parameters to set in the container. This parameter +// maps to Sysctls in the Create a container (https://docs.docker.com/engine/api/v1.35/#operation/ContainerCreate) +// section of the Docker Remote API (https://docs.docker.com/engine/api/v1.35/) +// and the --sysctl option to docker run (https://docs.docker.com/engine/reference/run/). +// +// It is not recommended that you specify network-related systemControls parameters +// for multiple containers in a single task that also uses either the awsvpc +// or host network modes. When you do, the container that is started last will +// determine which systemControls parameters take effect. +type SystemControl struct { + _ struct{} `type:"structure"` + + // The namespaced kernel parameter to set a value for. + Namespace *string `locationName:"namespace" type:"string"` + + // The value for the namespaced kernel parameter specifed in namespace. + Value *string `locationName:"value" type:"string"` +} + +// String returns the string representation +func (s SystemControl) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s SystemControl) GoString() string { + return s.String() +} + +// SetNamespace sets the Namespace field's value. +func (s *SystemControl) SetNamespace(v string) *SystemControl { + s.Namespace = &v + return s +} + +// SetValue sets the Value field's value. +func (s *SystemControl) SetValue(v string) *SystemControl { + s.Value = &v + return s +} + // Details on a task in a cluster. type Task struct { _ struct{} `type:"structure"` @@ -11054,8 +11151,9 @@ func (s *VersionInfo) SetDockerVersion(v string) *VersionInfo { type Volume struct { _ struct{} `type:"structure"` - // The configuration for the Docker volume. This parameter is specified when - // using Docker volumes. + // This parameter is specified when using Docker volumes. Docker volumes are + // only supported when using the EC2 launch type. Windows containers only support + // the use of the local driver. To use bind mounts, specify a host instead. DockerVolumeConfiguration *DockerVolumeConfiguration `locationName:"dockerVolumeConfiguration" type:"structure"` // This parameter is specified when using bind mount host volumes. Bind mount diff --git a/vendor/github.com/aws/aws-sdk-go/service/elasticache/api.go b/vendor/github.com/aws/aws-sdk-go/service/elasticache/api.go index 18d404a5c6d..7adb50822e8 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/elasticache/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/elasticache/api.go @@ -3,6 +3,7 @@ package elasticache import ( + "fmt" "time" "github.com/aws/aws-sdk-go/aws" @@ -65,7 +66,7 @@ func (c *ElastiCache) AddTagsToResourceRequest(input *AddTagsToResourceInput) (r // by your tags. You can apply tags that represent business categories (such // as cost centers, application names, or owners) to organize your costs across // multiple services. For more information, see Using Cost Allocation Tags in -// Amazon ElastiCache (http://docs.aws.amazon.com/AmazonElastiCache/latest/UserGuide/Tagging.html) +// Amazon ElastiCache (http://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/Tagging.html) // in the ElastiCache User Guide. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -262,8 +263,8 @@ func (c *ElastiCache) CopySnapshotRequest(input *CopySnapshotInput) (req *reques // create their own Amazon S3 buckets and copy snapshots to it. To control access // to your snapshots, use an IAM policy to control who has the ability to use // the CopySnapshot operation. For more information about using IAM to control -// the use of ElastiCache operations, see Exporting Snapshots (http://docs.aws.amazon.com/AmazonElastiCache/latest/UserGuide/Snapshots.Exporting.html) -// and Authentication & Access Control (http://docs.aws.amazon.com/AmazonElastiCache/latest/UserGuide/IAM.html). +// the use of ElastiCache operations, see Exporting Snapshots (http://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/Snapshots.Exporting.html) +// and Authentication & Access Control (http://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/IAM.html). // // You could receive the following error messages. // @@ -272,19 +273,19 @@ func (c *ElastiCache) CopySnapshotRequest(input *CopySnapshotInput) (req *reques // * Error Message: The S3 bucket %s is outside of the region. // // Solution: Create an Amazon S3 bucket in the same region as your snapshot. -// For more information, see Step 1: Create an Amazon S3 Bucket (http://docs.aws.amazon.com/AmazonElastiCache/latest/UserGuide/Snapshots.Exporting.html#Snapshots.Exporting.CreateBucket) +// For more information, see Step 1: Create an Amazon S3 Bucket (http://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/Snapshots.Exporting.html#Snapshots.Exporting.CreateBucket) // in the ElastiCache User Guide. // // * Error Message: The S3 bucket %s does not exist. // // Solution: Create an Amazon S3 bucket in the same region as your snapshot. -// For more information, see Step 1: Create an Amazon S3 Bucket (http://docs.aws.amazon.com/AmazonElastiCache/latest/UserGuide/Snapshots.Exporting.html#Snapshots.Exporting.CreateBucket) +// For more information, see Step 1: Create an Amazon S3 Bucket (http://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/Snapshots.Exporting.html#Snapshots.Exporting.CreateBucket) // in the ElastiCache User Guide. // // * Error Message: The S3 bucket %s is not owned by the authenticated user. // // Solution: Create an Amazon S3 bucket in the same region as your snapshot. -// For more information, see Step 1: Create an Amazon S3 Bucket (http://docs.aws.amazon.com/AmazonElastiCache/latest/UserGuide/Snapshots.Exporting.html#Snapshots.Exporting.CreateBucket) +// For more information, see Step 1: Create an Amazon S3 Bucket (http://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/Snapshots.Exporting.html#Snapshots.Exporting.CreateBucket) // in the ElastiCache User Guide. // // * Error Message: The authenticated user does not have sufficient permissions @@ -303,21 +304,21 @@ func (c *ElastiCache) CopySnapshotRequest(input *CopySnapshotInput) (req *reques // on the S3 Bucket. // // Solution: Add List and Read permissions on the bucket. For more information, -// see Step 2: Grant ElastiCache Access to Your Amazon S3 Bucket (http://docs.aws.amazon.com/AmazonElastiCache/latest/UserGuide/Snapshots.Exporting.html#Snapshots.Exporting.GrantAccess) +// see Step 2: Grant ElastiCache Access to Your Amazon S3 Bucket (http://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/Snapshots.Exporting.html#Snapshots.Exporting.GrantAccess) // in the ElastiCache User Guide. // // * Error Message: ElastiCache has not been granted WRITE permissions %s // on the S3 Bucket. // // Solution: Add Upload/Delete permissions on the bucket. For more information, -// see Step 2: Grant ElastiCache Access to Your Amazon S3 Bucket (http://docs.aws.amazon.com/AmazonElastiCache/latest/UserGuide/Snapshots.Exporting.html#Snapshots.Exporting.GrantAccess) +// see Step 2: Grant ElastiCache Access to Your Amazon S3 Bucket (http://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/Snapshots.Exporting.html#Snapshots.Exporting.GrantAccess) // in the ElastiCache User Guide. // // * Error Message: ElastiCache has not been granted READ_ACP permissions // %s on the S3 Bucket. // // Solution: Add View Permissions on the bucket. For more information, see Step -// 2: Grant ElastiCache Access to Your Amazon S3 Bucket (http://docs.aws.amazon.com/AmazonElastiCache/latest/UserGuide/Snapshots.Exporting.html#Snapshots.Exporting.GrantAccess) +// 2: Grant ElastiCache Access to Your Amazon S3 Bucket (http://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/Snapshots.Exporting.html#Snapshots.Exporting.GrantAccess) // in the ElastiCache User Guide. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -417,9 +418,7 @@ func (c *ElastiCache) CreateCacheClusterRequest(input *CreateCacheClusterInput) // Creates a cluster. All nodes in the cluster run the same protocol-compliant // cache engine software, either Memcached or Redis. // -// Due to current limitations on Redis (cluster mode disabled), this operation -// or parameter is not supported on Redis (cluster mode enabled) replication -// groups. +// This operation is not supported for Redis (cluster mode enabled) clusters. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about @@ -558,7 +557,7 @@ func (c *ElastiCache) CreateCacheParameterGroupRequest(input *CreateCacheParamet // * ModifyCacheParameterGroup (http://docs.aws.amazon.com/AmazonElastiCache/latest/APIReference/API_ModifyCacheParameterGroup.html) // in the ElastiCache API Reference. // -// * Parameters and Parameter Groups (http://docs.aws.amazon.com/AmazonElastiCache/latest/UserGuide/ParameterGroups.html) +// * Parameters and Parameter Groups (http://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/ParameterGroups.html) // in the ElastiCache User Guide. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -860,7 +859,7 @@ func (c *ElastiCache) CreateReplicationGroupRequest(input *CreateReplicationGrou // group after it has been created. However, if you need to increase or decrease // the number of node groups (console: shards), you can avail yourself of ElastiCache // for Redis' enhanced backup and restore. For more information, see Restoring -// From a Backup with Cluster Resizing (http://docs.aws.amazon.com/AmazonElastiCache/latest/UserGuide/backups-restoring.html) +// From a Backup with Cluster Resizing (http://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/backups-restoring.html) // in the ElastiCache User Guide. // // This operation is valid for Redis only. @@ -1066,6 +1065,126 @@ func (c *ElastiCache) CreateSnapshotWithContext(ctx aws.Context, input *CreateSn return out, req.Send() } +const opDecreaseReplicaCount = "DecreaseReplicaCount" + +// DecreaseReplicaCountRequest generates a "aws/request.Request" representing the +// client's request for the DecreaseReplicaCount operation. The "output" return +// value will be populated with the request's response once the request completes +// successfuly. +// +// Use "Send" method on the returned Request to send the API call to the service. +// the "output" return value is not valid until after Send returns without error. +// +// See DecreaseReplicaCount for more information on using the DecreaseReplicaCount +// API call, and error handling. +// +// This method is useful when you want to inject custom logic or configuration +// into the SDK's request lifecycle. Such as custom headers, or retry logic. +// +// +// // Example sending a request using the DecreaseReplicaCountRequest method. +// req, resp := client.DecreaseReplicaCountRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/elasticache-2015-02-02/DecreaseReplicaCount +func (c *ElastiCache) DecreaseReplicaCountRequest(input *DecreaseReplicaCountInput) (req *request.Request, output *DecreaseReplicaCountOutput) { + op := &request.Operation{ + Name: opDecreaseReplicaCount, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &DecreaseReplicaCountInput{} + } + + output = &DecreaseReplicaCountOutput{} + req = c.newRequest(op, input, output) + return +} + +// DecreaseReplicaCount API operation for Amazon ElastiCache. +// +// Dynamically decreases the number of replics in a Redis (cluster mode disabled) +// replication group or the number of replica nodes in one or more node groups +// (shards) of a Redis (cluster mode enabled) replication group. This operation +// is performed with no cluster down time. +// +// Returns awserr.Error for service API and SDK errors. Use runtime type assertions +// with awserr.Error's Code and Message methods to get detailed information about +// the error. +// +// See the AWS API reference guide for Amazon ElastiCache's +// API operation DecreaseReplicaCount for usage and error information. +// +// Returned Error Codes: +// * ErrCodeReplicationGroupNotFoundFault "ReplicationGroupNotFoundFault" +// The specified replication group does not exist. +// +// * ErrCodeInvalidReplicationGroupStateFault "InvalidReplicationGroupState" +// The requested replication group is not in the available state. +// +// * ErrCodeInvalidCacheClusterStateFault "InvalidCacheClusterState" +// The requested cluster is not in the available state. +// +// * ErrCodeInvalidVPCNetworkStateFault "InvalidVPCNetworkStateFault" +// The VPC network is in an invalid state. +// +// * ErrCodeInsufficientCacheClusterCapacityFault "InsufficientCacheClusterCapacity" +// The requested cache node type is not available in the specified Availability +// Zone. +// +// * ErrCodeClusterQuotaForCustomerExceededFault "ClusterQuotaForCustomerExceeded" +// The request cannot be processed because it would exceed the allowed number +// of clusters per customer. +// +// * ErrCodeNodeGroupsPerReplicationGroupQuotaExceededFault "NodeGroupsPerReplicationGroupQuotaExceeded" +// The request cannot be processed because it would exceed the maximum allowed +// number of node groups (shards) in a single replication group. The default +// maximum is 15 +// +// * ErrCodeNodeQuotaForCustomerExceededFault "NodeQuotaForCustomerExceeded" +// The request cannot be processed because it would exceed the allowed number +// of cache nodes per customer. +// +// * ErrCodeServiceLinkedRoleNotFoundFault "ServiceLinkedRoleNotFoundFault" +// The specified service linked role (SLR) was not found. +// +// * ErrCodeNoOperationFault "NoOperationFault" +// The operation was not performed because no changes were required. +// +// * ErrCodeInvalidParameterValueException "InvalidParameterValue" +// The value for a parameter is invalid. +// +// * ErrCodeInvalidParameterCombinationException "InvalidParameterCombination" +// Two or more incompatible parameters were specified. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/elasticache-2015-02-02/DecreaseReplicaCount +func (c *ElastiCache) DecreaseReplicaCount(input *DecreaseReplicaCountInput) (*DecreaseReplicaCountOutput, error) { + req, out := c.DecreaseReplicaCountRequest(input) + return out, req.Send() +} + +// DecreaseReplicaCountWithContext is the same as DecreaseReplicaCount with the addition of +// the ability to pass a context and additional request options. +// +// See DecreaseReplicaCount for details on how to use this API operation. +// +// The context must be non-nil and will be used for request cancellation. If +// the context is nil a panic will occur. In the future the SDK may create +// sub-contexts for http.Requests. See https://golang.org/pkg/context/ +// for more information on using Contexts. +func (c *ElastiCache) DecreaseReplicaCountWithContext(ctx aws.Context, input *DecreaseReplicaCountInput, opts ...request.Option) (*DecreaseReplicaCountOutput, error) { + req, out := c.DecreaseReplicaCountRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opDeleteCacheCluster = "DeleteCacheCluster" // DeleteCacheClusterRequest generates a "aws/request.Request" representing the @@ -1119,9 +1238,7 @@ func (c *ElastiCache) DeleteCacheClusterRequest(input *DeleteCacheClusterInput) // of a replication group or node group (shard) that has Multi-AZ mode enabled // or a cluster from a Redis (cluster mode enabled) replication group. // -// Due to current limitations on Redis (cluster mode disabled), this operation -// or parameter is not supported on Redis (cluster mode enabled) replication -// groups. +// This operation is not valid for Redis (cluster mode enabled) clusters. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about @@ -3382,6 +3499,123 @@ func (c *ElastiCache) DescribeSnapshotsPagesWithContext(ctx aws.Context, input * return p.Err() } +const opIncreaseReplicaCount = "IncreaseReplicaCount" + +// IncreaseReplicaCountRequest generates a "aws/request.Request" representing the +// client's request for the IncreaseReplicaCount operation. The "output" return +// value will be populated with the request's response once the request completes +// successfuly. +// +// Use "Send" method on the returned Request to send the API call to the service. +// the "output" return value is not valid until after Send returns without error. +// +// See IncreaseReplicaCount for more information on using the IncreaseReplicaCount +// API call, and error handling. +// +// This method is useful when you want to inject custom logic or configuration +// into the SDK's request lifecycle. Such as custom headers, or retry logic. +// +// +// // Example sending a request using the IncreaseReplicaCountRequest method. +// req, resp := client.IncreaseReplicaCountRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/elasticache-2015-02-02/IncreaseReplicaCount +func (c *ElastiCache) IncreaseReplicaCountRequest(input *IncreaseReplicaCountInput) (req *request.Request, output *IncreaseReplicaCountOutput) { + op := &request.Operation{ + Name: opIncreaseReplicaCount, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &IncreaseReplicaCountInput{} + } + + output = &IncreaseReplicaCountOutput{} + req = c.newRequest(op, input, output) + return +} + +// IncreaseReplicaCount API operation for Amazon ElastiCache. +// +// Dynamically increases the number of replics in a Redis (cluster mode disabled) +// replication group or the number of replica nodes in one or more node groups +// (shards) of a Redis (cluster mode enabled) replication group. This operation +// is performed with no cluster down time. +// +// Returns awserr.Error for service API and SDK errors. Use runtime type assertions +// with awserr.Error's Code and Message methods to get detailed information about +// the error. +// +// See the AWS API reference guide for Amazon ElastiCache's +// API operation IncreaseReplicaCount for usage and error information. +// +// Returned Error Codes: +// * ErrCodeReplicationGroupNotFoundFault "ReplicationGroupNotFoundFault" +// The specified replication group does not exist. +// +// * ErrCodeInvalidReplicationGroupStateFault "InvalidReplicationGroupState" +// The requested replication group is not in the available state. +// +// * ErrCodeInvalidCacheClusterStateFault "InvalidCacheClusterState" +// The requested cluster is not in the available state. +// +// * ErrCodeInvalidVPCNetworkStateFault "InvalidVPCNetworkStateFault" +// The VPC network is in an invalid state. +// +// * ErrCodeInsufficientCacheClusterCapacityFault "InsufficientCacheClusterCapacity" +// The requested cache node type is not available in the specified Availability +// Zone. +// +// * ErrCodeClusterQuotaForCustomerExceededFault "ClusterQuotaForCustomerExceeded" +// The request cannot be processed because it would exceed the allowed number +// of clusters per customer. +// +// * ErrCodeNodeGroupsPerReplicationGroupQuotaExceededFault "NodeGroupsPerReplicationGroupQuotaExceeded" +// The request cannot be processed because it would exceed the maximum allowed +// number of node groups (shards) in a single replication group. The default +// maximum is 15 +// +// * ErrCodeNodeQuotaForCustomerExceededFault "NodeQuotaForCustomerExceeded" +// The request cannot be processed because it would exceed the allowed number +// of cache nodes per customer. +// +// * ErrCodeNoOperationFault "NoOperationFault" +// The operation was not performed because no changes were required. +// +// * ErrCodeInvalidParameterValueException "InvalidParameterValue" +// The value for a parameter is invalid. +// +// * ErrCodeInvalidParameterCombinationException "InvalidParameterCombination" +// Two or more incompatible parameters were specified. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/elasticache-2015-02-02/IncreaseReplicaCount +func (c *ElastiCache) IncreaseReplicaCount(input *IncreaseReplicaCountInput) (*IncreaseReplicaCountOutput, error) { + req, out := c.IncreaseReplicaCountRequest(input) + return out, req.Send() +} + +// IncreaseReplicaCountWithContext is the same as IncreaseReplicaCount with the addition of +// the ability to pass a context and additional request options. +// +// See IncreaseReplicaCount for details on how to use this API operation. +// +// The context must be non-nil and will be used for request cancellation. If +// the context is nil a panic will occur. In the future the SDK may create +// sub-contexts for http.Requests. See https://golang.org/pkg/context/ +// for more information on using Contexts. +func (c *ElastiCache) IncreaseReplicaCountWithContext(ctx aws.Context, input *IncreaseReplicaCountInput, opts ...request.Option) (*IncreaseReplicaCountOutput, error) { + req, out := c.IncreaseReplicaCountRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opListAllowedNodeTypeModifications = "ListAllowedNodeTypeModifications" // ListAllowedNodeTypeModificationsRequest generates a "aws/request.Request" representing the @@ -3524,9 +3758,11 @@ func (c *ElastiCache) ListTagsForResourceRequest(input *ListTagsForResourceInput // optional. You can use cost allocation tags to categorize and track your AWS // costs. // +// If the cluster is not in the available state, ListTagsForResource returns +// an error. +// // You can have a maximum of 50 cost allocation tags on an ElastiCache resource. -// For more information, see Using Cost Allocation Tags in Amazon ElastiCache -// (http://docs.aws.amazon.com/AmazonElastiCache/latest/UserGuide/BestPractices.html). +// For more information, see Monitoring Costs with Tags (http://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/Tagging.html). // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about @@ -3911,9 +4147,16 @@ func (c *ElastiCache) ModifyReplicationGroupRequest(input *ModifyReplicationGrou // // Modifies the settings for a replication group. // -// Due to current limitations on Redis (cluster mode disabled), this operation -// or parameter is not supported on Redis (cluster mode enabled) replication -// groups. +// For Redis (cluster mode enabled) clusters, this operation cannot be used +// to change a cluster's node type or engine version. For more information, +// see: +// +// * Scaling for Amazon ElastiCache for Redis—Redis (cluster mode enabled) +// (http://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/scaling-redis-cluster-mode-enabled.html) +// in the ElastiCache User Guide +// +// * ModifyReplicationGroupShardConfiguration (http://docs.aws.amazon.com/AmazonElastiCache/latest/APIReference/API_ModifyReplicationGroupShardConfiguration.html) +// in the ElastiCache API Reference // // This operation is valid for Redis only. // @@ -4035,14 +4278,8 @@ func (c *ElastiCache) ModifyReplicationGroupShardConfigurationRequest(input *Mod // ModifyReplicationGroupShardConfiguration API operation for Amazon ElastiCache. // -// Performs horizontal scaling on a Redis (cluster mode enabled) cluster with -// no downtime. Requires Redis engine version 3.2.10 or newer. For information -// on upgrading your engine to a newer version, see Upgrading Engine Versions -// (http://docs.aws.amazon.com/AmazonElastiCache/latest/UserGuide/VersionManagement.html) -// in the Amazon ElastiCache User Guide. -// -// For more information on ElastiCache for Redis online horizontal scaling, -// see ElastiCache for Redis Horizontal Scaling (http://docs.aws.amazon.com/AmazonElastiCache/latest/UserGuide/redis-cluster-resharding-online.html) +// Modifies a replication group's shards (node groups) by allowing you to add +// shards, remove shards, or rebalance the keyspaces among exisiting shards. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about @@ -4256,7 +4493,7 @@ func (c *ElastiCache) RebootCacheClusterRequest(input *RebootCacheClusterInput) // enabled) clusters. // // If you make changes to parameters that require a Redis (cluster mode enabled) -// cluster reboot for the changes to be applied, see Rebooting a Cluster (http://docs.aws.amazon.com/AmazonElastiCache/latest/UserGuide/Clusters.Rebooting.htm) +// cluster reboot for the changes to be applied, see Rebooting a Cluster (http://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/Clusters.Rebooting.html) // for an alternate process. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -4650,13 +4887,13 @@ func (c *ElastiCache) TestFailoverRequest(input *TestFailoverInput) (req *reques // // For more information see: // -// Viewing ElastiCache Events (http://docs.aws.amazon.com/AmazonElastiCache/latest/UserGuide/ECEvents.Viewing.html) +// Viewing ElastiCache Events (http://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/ECEvents.Viewing.html) // in the ElastiCache User Guide // // DescribeEvents (http://docs.aws.amazon.com/AmazonElastiCache/latest/APIReference/API_DescribeEvents.html) // in the ElastiCache API Reference // -// Also see, Testing Multi-AZ with Automatic Failover (http://docs.aws.amazon.com/AmazonElastiCache/latest/UserGuide/AutoFailover.html#auto-failover-test) +// Also see, Testing Multi-AZ with Automatic Failover (http://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/AutoFailover.html#auto-failover-test) // in the ElastiCache User Guide. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -4685,6 +4922,7 @@ func (c *ElastiCache) TestFailoverRequest(input *TestFailoverInput) (req *reques // The specified replication group does not exist. // // * ErrCodeTestFailoverNotAvailableFault "TestFailoverNotAvailableFault" +// The TestFailover action is not available. // // * ErrCodeInvalidParameterValueException "InvalidParameterValue" // The value for a parameter is invalid. @@ -4907,6 +5145,9 @@ type CacheCluster struct { // is created. To enable at-rest encryption on a cluster you must set AtRestEncryptionEnabled // to true when you create a cluster. // + // Required: Only available when creating a replication group in an Amazon VPC + // using redis version 3.2.6 or 4.x. + // // Default: false AtRestEncryptionEnabled *bool `type:"boolean"` @@ -4966,6 +5207,9 @@ type CacheCluster struct { // R3 node types:cache.r3.large, cache.r3.xlarge, cache.r3.2xlarge, cache.r3.4xlarge, // cache.r3.8xlarge // + // R4 node types;cache.r4.large, cache.r4.xlarge, cache.r4.2xlarge, cache.r4.4xlarge, + // cache.r4.8xlarge, cache.r4.16xlarge + // // Previous generation: (not recommended) // // M2 node types:cache.m2.xlarge, cache.m2.2xlarge, cache.m2.4xlarge @@ -4984,10 +5228,13 @@ type CacheCluster struct { // * Redis Append-only files (AOF) functionality is not supported for T1 // or T2 instances. // - // For a complete listing of node types and specifications, see Amazon ElastiCache - // Product Features and Details (http://aws.amazon.com/elasticache/details) - // and either Cache Node Type-Specific Parameters for Memcached (http://docs.aws.amazon.com/AmazonElastiCache/latest/UserGuide/CacheParameterGroups.Memcached.html#ParameterGroups.Memcached.NodeSpecific) - // or Cache Node Type-Specific Parameters for Redis (http://docs.aws.amazon.com/AmazonElastiCache/latest/UserGuide/CacheParameterGroups.Redis.html#ParameterGroups.Redis.NodeSpecific). + // For a complete listing of node types and specifications, see: + // + // * Amazon ElastiCache Product Features and Details (http://aws.amazon.com/elasticache/details) + // + // * Cache Node Type-Specific Parameters for Memcached (http://docs.aws.amazon.com/AmazonElastiCache/latest/mem-ug/ParameterGroups.Memcached.html#ParameterGroups.Memcached.NodeSpecific) + // + // * Cache Node Type-Specific Parameters for Redis (http://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/ParameterGroups.Redis.html#ParameterGroups.Redis.NodeSpecific) CacheNodeType *string `type:"string"` // A list of cache nodes that are members of the cluster. @@ -5088,6 +5335,9 @@ type CacheCluster struct { // is created. To enable in-transit encryption on a cluster you must set TransitEncryptionEnabled // to true when you create a cluster. // + // Required: Only available when creating a replication group in an Amazon VPC + // using redis version 3.2.6 or 4.x. + // // Default: false TransitEncryptionEnabled *bool `type:"boolean"` } @@ -5264,7 +5514,7 @@ type CacheEngineVersion struct { // The name of the cache parameter group family associated with this cache engine. // - // Valid values are: memcached1.4 | redis2.6 | redis2.8 | redis3.2 + // Valid values are: memcached1.4 | redis2.6 | redis2.8 | redis3.2 | redis4.0 CacheParameterGroupFamily *string `type:"string"` // The name of the cache engine. @@ -5352,6 +5602,9 @@ func (s *CacheEngineVersion) SetEngineVersion(v string) *CacheEngineVersion { // R3 node types:cache.r3.large, cache.r3.xlarge, cache.r3.2xlarge, cache.r3.4xlarge, // cache.r3.8xlarge // +// R4 node types;cache.r4.large, cache.r4.xlarge, cache.r4.2xlarge, cache.r4.4xlarge, +// cache.r4.8xlarge, cache.r4.16xlarge +// // Previous generation: (not recommended) // // M2 node types:cache.m2.xlarge, cache.m2.2xlarge, cache.m2.4xlarge @@ -5370,10 +5623,13 @@ func (s *CacheEngineVersion) SetEngineVersion(v string) *CacheEngineVersion { // * Redis Append-only files (AOF) functionality is not supported for T1 // or T2 instances. // -// For a complete listing of node types and specifications, see Amazon ElastiCache -// Product Features and Details (http://aws.amazon.com/elasticache/details) -// and either Cache Node Type-Specific Parameters for Memcached (http://docs.aws.amazon.com/AmazonElastiCache/latest/UserGuide/CacheParameterGroups.Memcached.html#ParameterGroups.Memcached.NodeSpecific) -// or Cache Node Type-Specific Parameters for Redis (http://docs.aws.amazon.com/AmazonElastiCache/latest/UserGuide/CacheParameterGroups.Redis.html#ParameterGroups.Redis.NodeSpecific). +// For a complete listing of node types and specifications, see: +// +// * Amazon ElastiCache Product Features and Details (http://aws.amazon.com/elasticache/details) +// +// * Cache Node Type-Specific Parameters for Memcached (http://docs.aws.amazon.com/AmazonElastiCache/latest/mem-ug/ParameterGroups.Memcached.html#ParameterGroups.Memcached.NodeSpecific) +// +// * Cache Node Type-Specific Parameters for Redis (http://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/ParameterGroups.Redis.html#ParameterGroups.Redis.NodeSpecific) type CacheNode struct { _ struct{} `type:"structure"` @@ -5469,7 +5725,7 @@ type CacheNodeTypeSpecificParameter struct { // Indicates whether a change to the parameter is applied immediately or requires // a reboot for the change to be applied. You can force a reboot or wait until // the next maintenance window's reboot. For more information, see Rebooting - // a Cluster (http://docs.aws.amazon.com/AmazonElastiCache/latest/UserGuide/Clusters.Rebooting.html). + // a Cluster (http://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/Clusters.Rebooting.html). ChangeType *string `type:"string" enum:"ChangeType"` // The valid data type for the parameter. @@ -5597,7 +5853,7 @@ type CacheParameterGroup struct { // The name of the cache parameter group family that this cache parameter group // is compatible with. // - // Valid values are: memcached1.4 | redis2.6 | redis2.8 | redis3.2 + // Valid values are: memcached1.4 | redis2.6 | redis2.8 | redis3.2 | redis4.0 CacheParameterGroupFamily *string `type:"string"` // The name of the cache parameter group. @@ -5855,6 +6111,93 @@ func (s *CacheSubnetGroup) SetVpcId(v string) *CacheSubnetGroup { return s } +// Node group (shard) configuration options when adding or removing replicas. +// Each node group (shard) configuration has the following members: NodeGroupId, +// NewReplicaCount, and PreferredAvailabilityZones. +type ConfigureShard struct { + _ struct{} `type:"structure"` + + // The number of replicas you want in this node group at the end of this operation. + // The maximum value for NewReplicaCount is 5. The minimum value depends upon + // the type of Redis replication group you are working with. + // + // The minimum number of replicas in a shard or replication group is: + // + // * Redis (cluster mode disabled) + // + // If Multi-AZ with Automatic Failover is enabled: 1 + // + // If Multi-AZ with Automatic Failover is not enable: 0 + // + // * Redis (cluster mode enabled): 0 (though you will not be able to failover + // to a replica if your primary node fails) + // + // NewReplicaCount is a required field + NewReplicaCount *int64 `type:"integer" required:"true"` + + // The 4-digit id for the node group you are configuring. For Redis (cluster + // mode disabled) replication groups, the node group id is always 0001. To find + // a Redis (cluster mode enabled)'s node group's (shard's) id, see Finding a + // Shard's Id (http://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/shard-find-id.html). + // + // NodeGroupId is a required field + NodeGroupId *string `min:"1" type:"string" required:"true"` + + // A list of PreferredAvailabilityZone strings that specify which availability + // zones the replication group's nodes are to be in. The nummber of PreferredAvailabilityZone + // values must equal the value of NewReplicaCount plus 1 to account for the + // primary node. If this member of ReplicaConfiguration is omitted, ElastiCache + // for Redis selects the availability zone for each of the replicas. + PreferredAvailabilityZones []*string `locationNameList:"PreferredAvailabilityZone" type:"list"` +} + +// String returns the string representation +func (s ConfigureShard) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s ConfigureShard) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *ConfigureShard) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "ConfigureShard"} + if s.NewReplicaCount == nil { + invalidParams.Add(request.NewErrParamRequired("NewReplicaCount")) + } + if s.NodeGroupId == nil { + invalidParams.Add(request.NewErrParamRequired("NodeGroupId")) + } + if s.NodeGroupId != nil && len(*s.NodeGroupId) < 1 { + invalidParams.Add(request.NewErrParamMinLen("NodeGroupId", 1)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetNewReplicaCount sets the NewReplicaCount field's value. +func (s *ConfigureShard) SetNewReplicaCount(v int64) *ConfigureShard { + s.NewReplicaCount = &v + return s +} + +// SetNodeGroupId sets the NodeGroupId field's value. +func (s *ConfigureShard) SetNodeGroupId(v string) *ConfigureShard { + s.NodeGroupId = &v + return s +} + +// SetPreferredAvailabilityZones sets the PreferredAvailabilityZones field's value. +func (s *ConfigureShard) SetPreferredAvailabilityZones(v []*string) *ConfigureShard { + s.PreferredAvailabilityZones = v + return s +} + // Represents the input of a CopySnapshotMessage operation. type CopySnapshotInput struct { _ struct{} `type:"structure"` @@ -5869,10 +6212,10 @@ type CopySnapshotInput struct { // // When using this parameter to export a snapshot, be sure Amazon ElastiCache // has the needed permissions to this S3 bucket. For more information, see Step - // 2: Grant ElastiCache Access to Your Amazon S3 Bucket (http://docs.aws.amazon.com/AmazonElastiCache/latest/UserGuide/Snapshots.Exporting.html#Snapshots.Exporting.GrantAccess) + // 2: Grant ElastiCache Access to Your Amazon S3 Bucket (http://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/Snapshots.Exporting.html#Snapshots.Exporting.GrantAccess) // in the Amazon ElastiCache User Guide. // - // For more information, see Exporting a Snapshot (http://docs.aws.amazon.com/AmazonElastiCache/latest/UserGuide/Snapshots.Exporting.html) + // For more information, see Exporting a Snapshot (http://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/Snapshots.Exporting.html) // in the Amazon ElastiCache User Guide. TargetBucket *string `type:"string"` @@ -5968,13 +6311,6 @@ type CreateCacheClusterInput struct { // Reserved parameter. The password used to access a password protected server. // - // This parameter is valid only if: - // - // * The parameter TransitEncryptionEnabled was set to true when the cluster - // was created. - // - // * The line requirepass was added to the database configuration file. - // // Password constraints: // // * Must be only printable ASCII characters. @@ -6040,6 +6376,9 @@ type CreateCacheClusterInput struct { // R3 node types:cache.r3.large, cache.r3.xlarge, cache.r3.2xlarge, cache.r3.4xlarge, // cache.r3.8xlarge // + // R4 node types;cache.r4.large, cache.r4.xlarge, cache.r4.2xlarge, cache.r4.4xlarge, + // cache.r4.8xlarge, cache.r4.16xlarge + // // Previous generation: (not recommended) // // M2 node types:cache.m2.xlarge, cache.m2.2xlarge, cache.m2.4xlarge @@ -6058,10 +6397,13 @@ type CreateCacheClusterInput struct { // * Redis Append-only files (AOF) functionality is not supported for T1 // or T2 instances. // - // For a complete listing of node types and specifications, see Amazon ElastiCache - // Product Features and Details (http://aws.amazon.com/elasticache/details) - // and either Cache Node Type-Specific Parameters for Memcached (http://docs.aws.amazon.com/AmazonElastiCache/latest/UserGuide/CacheParameterGroups.Memcached.html#ParameterGroups.Memcached.NodeSpecific) - // or Cache Node Type-Specific Parameters for Redis (http://docs.aws.amazon.com/AmazonElastiCache/latest/UserGuide/CacheParameterGroups.Redis.html#ParameterGroups.Redis.NodeSpecific). + // For a complete listing of node types and specifications, see: + // + // * Amazon ElastiCache Product Features and Details (http://aws.amazon.com/elasticache/details) + // + // * Cache Node Type-Specific Parameters for Memcached (http://docs.aws.amazon.com/AmazonElastiCache/latest/mem-ug/ParameterGroups.Memcached.html#ParameterGroups.Memcached.NodeSpecific) + // + // * Cache Node Type-Specific Parameters for Redis (http://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/ParameterGroups.Redis.html#ParameterGroups.Redis.NodeSpecific) CacheNodeType *string `type:"string"` // The name of the parameter group to associate with this cluster. If this argument @@ -6083,7 +6425,7 @@ type CreateCacheClusterInput struct { // // If you're going to launch your cluster in an Amazon VPC, you need to create // a subnet group before you start creating a cluster. For more information, - // see Subnets and Subnet Groups (http://docs.aws.amazon.com/AmazonElastiCache/latest/UserGuide/SubnetGroups.html). + // see Subnets and Subnet Groups (http://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/SubnetGroups.html). CacheSubnetGroupName *string `type:"string"` // The name of the cache engine to be used for this cluster. @@ -6096,7 +6438,7 @@ type CreateCacheClusterInput struct { // operation. // // Important: You can upgrade to a newer engine version (see Selecting a Cache - // Engine and Version (http://docs.aws.amazon.com/AmazonElastiCache/latest/UserGuide/SelectEngine.html#VersionManagement)), + // Engine and Version (http://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/SelectEngine.html#VersionManagement)), // but you cannot downgrade to an earlier engine version. If you want to use // an earlier engine version, you must delete the existing cluster or replication // group and create it anew with the earlier engine version. @@ -6175,10 +6517,6 @@ type CreateCacheClusterInput struct { // Example: sun:23:00-mon:01:30 PreferredMaintenanceWindow *string `type:"string"` - // Due to current limitations on Redis (cluster mode disabled), this operation - // or parameter is not supported on Redis (cluster mode enabled) replication - // groups. - // // The ID of the replication group to which this cluster should belong. If this // parameter is specified, the cluster is added to the specified replication // group as a read replica; otherwise, the cluster is a standalone primary that @@ -6220,7 +6558,7 @@ type CreateCacheClusterInput struct { // // This parameter is only valid if the Engine parameter is redis. // - // Default: 0 (i.e., automatic backups are disabled for this cluster). + // Default: 0 (i.e., automatic backups are disabled for this cache cluster). SnapshotRetentionLimit *int64 `type:"integer"` // The daily time range (in UTC) during which ElastiCache begins taking a daily @@ -6429,7 +6767,7 @@ type CreateCacheParameterGroupInput struct { // The name of the cache parameter group family that the cache parameter group // can be used with. // - // Valid values are: memcached1.4 | redis2.6 | redis2.8 | redis3.2 + // Valid values are: memcached1.4 | redis2.6 | redis2.8 | redis3.2 | redis4.0 // // CacheParameterGroupFamily is a required field CacheParameterGroupFamily *string `type:"string" required:"true"` @@ -6712,20 +7050,19 @@ type CreateReplicationGroupInput struct { // must set AtRestEncryptionEnabled to true when you create the replication // group. // - // This parameter is valid only if the Engine parameter is redis and the cluster - // is being created in an Amazon VPC. + // Required: Only available when creating a replication group in an Amazon VPC + // using redis version 3.2.6 or 4.x. // // Default: false AtRestEncryptionEnabled *bool `type:"boolean"` // Reserved parameter. The password used to access a password protected server. // - // This parameter is valid only if: + // AuthToken can be specified only on replication groups where TransitEncryptionEnabled + // is true. // - // * The parameter TransitEncryptionEnabled was set to true when the cluster - // was created. - // - // * The line requirepass was added to the database configuration file. + // For HIPAA compliance, you must specify TransitEncryptionEnabled as true, + // an AuthToken, and a CacheSubnetGroup. // // Password constraints: // @@ -6799,6 +7136,9 @@ type CreateReplicationGroupInput struct { // R3 node types:cache.r3.large, cache.r3.xlarge, cache.r3.2xlarge, cache.r3.4xlarge, // cache.r3.8xlarge // + // R4 node types;cache.r4.large, cache.r4.xlarge, cache.r4.2xlarge, cache.r4.4xlarge, + // cache.r4.8xlarge, cache.r4.16xlarge + // // Previous generation: (not recommended) // // M2 node types:cache.m2.xlarge, cache.m2.2xlarge, cache.m2.4xlarge @@ -6817,10 +7157,13 @@ type CreateReplicationGroupInput struct { // * Redis Append-only files (AOF) functionality is not supported for T1 // or T2 instances. // - // For a complete listing of node types and specifications, see Amazon ElastiCache - // Product Features and Details (http://aws.amazon.com/elasticache/details) - // and either Cache Node Type-Specific Parameters for Memcached (http://docs.aws.amazon.com/AmazonElastiCache/latest/UserGuide/CacheParameterGroups.Memcached.html#ParameterGroups.Memcached.NodeSpecific) - // or Cache Node Type-Specific Parameters for Redis (http://docs.aws.amazon.com/AmazonElastiCache/latest/UserGuide/CacheParameterGroups.Redis.html#ParameterGroups.Redis.NodeSpecific). + // For a complete listing of node types and specifications, see: + // + // * Amazon ElastiCache Product Features and Details (http://aws.amazon.com/elasticache/details) + // + // * Cache Node Type-Specific Parameters for Memcached (http://docs.aws.amazon.com/AmazonElastiCache/latest/mem-ug/ParameterGroups.Memcached.html#ParameterGroups.Memcached.NodeSpecific) + // + // * Cache Node Type-Specific Parameters for Redis (http://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/ParameterGroups.Redis.html#ParameterGroups.Redis.NodeSpecific) CacheNodeType *string `type:"string"` // The name of the parameter group to associate with this replication group. @@ -6843,7 +7186,7 @@ type CreateReplicationGroupInput struct { // // If you're going to launch your cluster in an Amazon VPC, you need to create // a subnet group before you start creating a cluster. For more information, - // see Subnets and Subnet Groups (http://docs.aws.amazon.com/AmazonElastiCache/latest/UserGuide/SubnetGroups.html). + // see Subnets and Subnet Groups (http://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/SubnetGroups.html). CacheSubnetGroupName *string `type:"string"` // The name of the cache engine to be used for the clusters in this replication @@ -6855,7 +7198,7 @@ type CreateReplicationGroupInput struct { // operation. // // Important: You can upgrade to a newer engine version (see Selecting a Cache - // Engine and Version (http://docs.aws.amazon.com/AmazonElastiCache/latest/UserGuide/SelectEngine.html#VersionManagement)) + // Engine and Version (http://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/SelectEngine.html#VersionManagement)) // in the ElastiCache User Guide, but you cannot downgrade to an earlier engine // version. If you want to use an earlier engine version, you must delete the // existing cluster or replication group and create it anew with the earlier @@ -6863,12 +7206,15 @@ type CreateReplicationGroupInput struct { EngineVersion *string `type:"string"` // A list of node group (shard) configuration options. Each node group (shard) - // configuration has the following: Slots, PrimaryAvailabilityZone, ReplicaAvailabilityZones, - // ReplicaCount. + // configuration has the following members: PrimaryAvailabilityZone, ReplicaAvailabilityZones, + // ReplicaCount, and Slots. // // If you're creating a Redis (cluster mode disabled) or a Redis (cluster mode // enabled) replication group, you can use this parameter to individually configure - // each node group (shard), or you can omit this parameter. + // each node group (shard), or you can omit this parameter. However, when seeding + // a Redis (cluster mode enabled) cluster from a S3 rdb file, you must configure + // each node group (shard) using this parameter because you must specify the + // slots for each node group. NodeGroupConfiguration []*NodeGroupConfiguration `locationNameList:"NodeGroupConfiguration" type:"list"` // The Amazon Resource Name (ARN) of the Amazon Simple Notification Service @@ -6887,7 +7233,7 @@ type CreateReplicationGroupInput struct { // (it will default to 1), or you can explicitly set it to a value between 2 // and 6. // - // The maximum permitted value for NumCacheClusters is 6 (primary plus 5 replicas). + // The maximum permitted value for NumCacheClusters is 6 (1 primary plus 5 replicas). NumCacheClusters *int64 `type:"integer"` // An optional parameter that specifies the number of node groups (shards) for @@ -7014,7 +7360,7 @@ type CreateReplicationGroupInput struct { SnapshotWindow *string `type:"string"` // A list of cost allocation tags to be added to this resource. A tag is a key-value - // pair. A tag key does not have to be accompanied by a tag value. + // pair. Tags []*Tag `locationNameList:"Tag" type:"list"` // A flag that enables in-transit encryption when set to true. @@ -7024,12 +7370,18 @@ type CreateReplicationGroupInput struct { // to true when you create a cluster. // // This parameter is valid only if the Engine parameter is redis, the EngineVersion - // parameter is 3.2.4 or later, and the cluster is being created in an Amazon + // parameter is 3.2.6 or 4.x, and the cluster is being created in an Amazon // VPC. // // If you enable in-transit encryption, you must also specify a value for CacheSubnetGroup. // + // Required: Only available when creating a replication group in an Amazon VPC + // using redis version 3.2.6 or 4.x. + // // Default: false + // + // For HIPAA compliance, you must specify TransitEncryptionEnabled as true, + // an AuthToken, and a CacheSubnetGroup. TransitEncryptionEnabled *bool `type:"boolean"` } @@ -7052,6 +7404,16 @@ func (s *CreateReplicationGroupInput) Validate() error { if s.ReplicationGroupId == nil { invalidParams.Add(request.NewErrParamRequired("ReplicationGroupId")) } + if s.NodeGroupConfiguration != nil { + for i, v := range s.NodeGroupConfiguration { + if v == nil { + continue + } + if err := v.Validate(); err != nil { + invalidParams.AddNested(fmt.Sprintf("%s[%v]", "NodeGroupConfiguration", i), err.(request.ErrInvalidParams)) + } + } + } if invalidParams.Len() > 0 { return invalidParams @@ -7333,6 +7695,137 @@ func (s *CreateSnapshotOutput) SetSnapshot(v *Snapshot) *CreateSnapshotOutput { return s } +type DecreaseReplicaCountInput struct { + _ struct{} `type:"structure"` + + // If True, the number of replica nodes is decreased immediately. If False, + // the number of replica nodes is decreased during the next maintenance window. + // + // ApplyImmediately is a required field + ApplyImmediately *bool `type:"boolean" required:"true"` + + // The number of read replica nodes you want at the completion of this operation. + // For Redis (cluster mode disabled) replication groups, this is the number + // of replica nodes in the replication group. For Redis (cluster mode enabled) + // replication groups, this is the number of replica nodes in each of the replication + // group's node groups. + // + // The minimum number of replicas in a shard or replication group is: + // + // * Redis (cluster mode disabled) + // + // If Multi-AZ with Automatic Failover is enabled: 1 + // + // If Multi-AZ with Automatic Failover is not enabled: 0 + // + // * Redis (cluster mode enabled): 0 (though you will not be able to failover + // to a replica if your primary node fails) + NewReplicaCount *int64 `type:"integer"` + + // A list of ConfigureShard objects that can be used to configure each shard + // in a Redis (cluster mode enabled) replication group. The ConfigureShard has + // three members: NewReplicaCount, NodeGroupId, and PreferredAvailabilityZones. + ReplicaConfiguration []*ConfigureShard `locationNameList:"ConfigureShard" type:"list"` + + // A list of the node ids to remove from the replication group or node group + // (shard). + ReplicasToRemove []*string `type:"list"` + + // The id of the replication group from which you want to remove replica nodes. + // + // ReplicationGroupId is a required field + ReplicationGroupId *string `type:"string" required:"true"` +} + +// String returns the string representation +func (s DecreaseReplicaCountInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DecreaseReplicaCountInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *DecreaseReplicaCountInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "DecreaseReplicaCountInput"} + if s.ApplyImmediately == nil { + invalidParams.Add(request.NewErrParamRequired("ApplyImmediately")) + } + if s.ReplicationGroupId == nil { + invalidParams.Add(request.NewErrParamRequired("ReplicationGroupId")) + } + if s.ReplicaConfiguration != nil { + for i, v := range s.ReplicaConfiguration { + if v == nil { + continue + } + if err := v.Validate(); err != nil { + invalidParams.AddNested(fmt.Sprintf("%s[%v]", "ReplicaConfiguration", i), err.(request.ErrInvalidParams)) + } + } + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetApplyImmediately sets the ApplyImmediately field's value. +func (s *DecreaseReplicaCountInput) SetApplyImmediately(v bool) *DecreaseReplicaCountInput { + s.ApplyImmediately = &v + return s +} + +// SetNewReplicaCount sets the NewReplicaCount field's value. +func (s *DecreaseReplicaCountInput) SetNewReplicaCount(v int64) *DecreaseReplicaCountInput { + s.NewReplicaCount = &v + return s +} + +// SetReplicaConfiguration sets the ReplicaConfiguration field's value. +func (s *DecreaseReplicaCountInput) SetReplicaConfiguration(v []*ConfigureShard) *DecreaseReplicaCountInput { + s.ReplicaConfiguration = v + return s +} + +// SetReplicasToRemove sets the ReplicasToRemove field's value. +func (s *DecreaseReplicaCountInput) SetReplicasToRemove(v []*string) *DecreaseReplicaCountInput { + s.ReplicasToRemove = v + return s +} + +// SetReplicationGroupId sets the ReplicationGroupId field's value. +func (s *DecreaseReplicaCountInput) SetReplicationGroupId(v string) *DecreaseReplicaCountInput { + s.ReplicationGroupId = &v + return s +} + +type DecreaseReplicaCountOutput struct { + _ struct{} `type:"structure"` + + // Contains all of the attributes of a specific Redis replication group. + ReplicationGroup *ReplicationGroup `type:"structure"` +} + +// String returns the string representation +func (s DecreaseReplicaCountOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DecreaseReplicaCountOutput) GoString() string { + return s.String() +} + +// SetReplicationGroup sets the ReplicationGroup field's value. +func (s *DecreaseReplicaCountOutput) SetReplicationGroup(v *ReplicationGroup) *DecreaseReplicaCountOutput { + s.ReplicationGroup = v + return s +} + // Represents the input of a DeleteCacheCluster operation. type DeleteCacheClusterInput struct { _ struct{} `type:"structure"` @@ -7833,7 +8326,7 @@ type DescribeCacheEngineVersionsInput struct { // The name of a specific cache parameter group family to return details for. // - // Valid values are: memcached1.4 | redis2.6 | redis2.8 | redis3.2 + // Valid values are: memcached1.4 | redis2.6 | redis2.8 | redis3.2 | redis4.0 // // Constraints: // @@ -8328,7 +8821,7 @@ type DescribeEngineDefaultParametersInput struct { // The name of the cache parameter group family. // - // Valid values are: memcached1.4 | redis2.6 | redis2.8 | redis3.2 + // Valid values are: memcached1.4 | redis2.6 | redis2.8 | redis3.2 | redis4.0 // // CacheParameterGroupFamily is a required field CacheParameterGroupFamily *string `type:"string" required:"true"` @@ -8669,6 +9162,9 @@ type DescribeReservedCacheNodesInput struct { // R3 node types:cache.r3.large, cache.r3.xlarge, cache.r3.2xlarge, cache.r3.4xlarge, // cache.r3.8xlarge // + // R4 node types;cache.r4.large, cache.r4.xlarge, cache.r4.2xlarge, cache.r4.4xlarge, + // cache.r4.8xlarge, cache.r4.16xlarge + // // Previous generation: (not recommended) // // M2 node types:cache.m2.xlarge, cache.m2.2xlarge, cache.m2.4xlarge @@ -8687,10 +9183,13 @@ type DescribeReservedCacheNodesInput struct { // * Redis Append-only files (AOF) functionality is not supported for T1 // or T2 instances. // - // For a complete listing of node types and specifications, see Amazon ElastiCache - // Product Features and Details (http://aws.amazon.com/elasticache/details) - // and either Cache Node Type-Specific Parameters for Memcached (http://docs.aws.amazon.com/AmazonElastiCache/latest/UserGuide/CacheParameterGroups.Memcached.html#ParameterGroups.Memcached.NodeSpecific) - // or Cache Node Type-Specific Parameters for Redis (http://docs.aws.amazon.com/AmazonElastiCache/latest/UserGuide/CacheParameterGroups.Redis.html#ParameterGroups.Redis.NodeSpecific). + // For a complete listing of node types and specifications, see: + // + // * Amazon ElastiCache Product Features and Details (http://aws.amazon.com/elasticache/details) + // + // * Cache Node Type-Specific Parameters for Memcached (http://docs.aws.amazon.com/AmazonElastiCache/latest/mem-ug/ParameterGroups.Memcached.html#ParameterGroups.Memcached.NodeSpecific) + // + // * Cache Node Type-Specific Parameters for Redis (http://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/ParameterGroups.Redis.html#ParameterGroups.Redis.NodeSpecific) CacheNodeType *string `type:"string"` // The duration filter value, specified in years or seconds. Use this parameter @@ -8831,6 +9330,9 @@ type DescribeReservedCacheNodesOfferingsInput struct { // R3 node types:cache.r3.large, cache.r3.xlarge, cache.r3.2xlarge, cache.r3.4xlarge, // cache.r3.8xlarge // + // R4 node types;cache.r4.large, cache.r4.xlarge, cache.r4.2xlarge, cache.r4.4xlarge, + // cache.r4.8xlarge, cache.r4.16xlarge + // // Previous generation: (not recommended) // // M2 node types:cache.m2.xlarge, cache.m2.2xlarge, cache.m2.4xlarge @@ -8849,10 +9351,13 @@ type DescribeReservedCacheNodesOfferingsInput struct { // * Redis Append-only files (AOF) functionality is not supported for T1 // or T2 instances. // - // For a complete listing of node types and specifications, see Amazon ElastiCache - // Product Features and Details (http://aws.amazon.com/elasticache/details) - // and either Cache Node Type-Specific Parameters for Memcached (http://docs.aws.amazon.com/AmazonElastiCache/latest/UserGuide/CacheParameterGroups.Memcached.html#ParameterGroups.Memcached.NodeSpecific) - // or Cache Node Type-Specific Parameters for Redis (http://docs.aws.amazon.com/AmazonElastiCache/latest/UserGuide/CacheParameterGroups.Redis.html#ParameterGroups.Redis.NodeSpecific). + // For a complete listing of node types and specifications, see: + // + // * Amazon ElastiCache Product Features and Details (http://aws.amazon.com/elasticache/details) + // + // * Cache Node Type-Specific Parameters for Memcached (http://docs.aws.amazon.com/AmazonElastiCache/latest/mem-ug/ParameterGroups.Memcached.html#ParameterGroups.Memcached.NodeSpecific) + // + // * Cache Node Type-Specific Parameters for Redis (http://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/ParameterGroups.Redis.html#ParameterGroups.Redis.NodeSpecific) CacheNodeType *string `type:"string"` // Duration filter value, specified in years or seconds. Use this parameter @@ -9228,7 +9733,7 @@ type EngineDefaults struct { // Specifies the name of the cache parameter group family to which the engine // default parameters apply. // - // Valid values are: memcached1.4 | redis2.6 | redis2.8 | redis3.2 + // Valid values are: memcached1.4 | redis2.6 | redis2.8 | redis3.2 | redis4.0 CacheParameterGroupFamily *string `type:"string"` // Provides an identifier to allow retrieval of paginated results. @@ -9327,6 +9832,116 @@ func (s *Event) SetSourceType(v string) *Event { return s } +type IncreaseReplicaCountInput struct { + _ struct{} `type:"structure"` + + // If True, the number of replica nodes is increased immediately. If False, + // the number of replica nodes is increased during the next maintenance window. + // + // ApplyImmediately is a required field + ApplyImmediately *bool `type:"boolean" required:"true"` + + // The number of read replica nodes you want at the completion of this operation. + // For Redis (cluster mode disabled) replication groups, this is the number + // of replica nodes in the replication group. For Redis (cluster mode enabled) + // replication groups, this is the number of replica nodes in each of the replication + // group's node groups. + NewReplicaCount *int64 `type:"integer"` + + // A list of ConfigureShard objects that can be used to configure each shard + // in a Redis (cluster mode enabled) replication group. The ConfigureShard has + // three members: NewReplicaCount, NodeGroupId, and PreferredAvailabilityZones. + ReplicaConfiguration []*ConfigureShard `locationNameList:"ConfigureShard" type:"list"` + + // The id of the replication group to which you want to add replica nodes. + // + // ReplicationGroupId is a required field + ReplicationGroupId *string `type:"string" required:"true"` +} + +// String returns the string representation +func (s IncreaseReplicaCountInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s IncreaseReplicaCountInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *IncreaseReplicaCountInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "IncreaseReplicaCountInput"} + if s.ApplyImmediately == nil { + invalidParams.Add(request.NewErrParamRequired("ApplyImmediately")) + } + if s.ReplicationGroupId == nil { + invalidParams.Add(request.NewErrParamRequired("ReplicationGroupId")) + } + if s.ReplicaConfiguration != nil { + for i, v := range s.ReplicaConfiguration { + if v == nil { + continue + } + if err := v.Validate(); err != nil { + invalidParams.AddNested(fmt.Sprintf("%s[%v]", "ReplicaConfiguration", i), err.(request.ErrInvalidParams)) + } + } + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetApplyImmediately sets the ApplyImmediately field's value. +func (s *IncreaseReplicaCountInput) SetApplyImmediately(v bool) *IncreaseReplicaCountInput { + s.ApplyImmediately = &v + return s +} + +// SetNewReplicaCount sets the NewReplicaCount field's value. +func (s *IncreaseReplicaCountInput) SetNewReplicaCount(v int64) *IncreaseReplicaCountInput { + s.NewReplicaCount = &v + return s +} + +// SetReplicaConfiguration sets the ReplicaConfiguration field's value. +func (s *IncreaseReplicaCountInput) SetReplicaConfiguration(v []*ConfigureShard) *IncreaseReplicaCountInput { + s.ReplicaConfiguration = v + return s +} + +// SetReplicationGroupId sets the ReplicationGroupId field's value. +func (s *IncreaseReplicaCountInput) SetReplicationGroupId(v string) *IncreaseReplicaCountInput { + s.ReplicationGroupId = &v + return s +} + +type IncreaseReplicaCountOutput struct { + _ struct{} `type:"structure"` + + // Contains all of the attributes of a specific Redis replication group. + ReplicationGroup *ReplicationGroup `type:"structure"` +} + +// String returns the string representation +func (s IncreaseReplicaCountOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s IncreaseReplicaCountOutput) GoString() string { + return s.String() +} + +// SetReplicationGroup sets the ReplicationGroup field's value. +func (s *IncreaseReplicaCountOutput) SetReplicationGroup(v *ReplicationGroup) *IncreaseReplicaCountOutput { + s.ReplicationGroup = v + return s +} + // The input parameters for the ListAllowedNodeTypeModifications operation. type ListAllowedNodeTypeModificationsInput struct { _ struct{} `type:"structure"` @@ -9461,7 +10076,7 @@ type ModifyCacheClusterInput struct { // Only newly created nodes are located in different Availability Zones. For // instructions on how to move existing Memcached nodes to different Availability // Zones, see the Availability Zone Considerations section of Cache Node Considerations - // for Memcached (http://docs.aws.amazon.com/AmazonElastiCache/latest/UserGuide/CacheNode.Memcached.html). + // for Memcached (http://docs.aws.amazon.com/AmazonElastiCache/latest/mem-ug/CacheNode.Memcached.html). AZMode *string `type:"string" enum:"AZMode"` // If true, this parameter causes the modifications in this request and any @@ -9520,7 +10135,7 @@ type ModifyCacheClusterInput struct { // The upgraded version of the cache engine to be run on the cache nodes. // // Important: You can upgrade to a newer engine version (see Selecting a Cache - // Engine and Version (http://docs.aws.amazon.com/AmazonElastiCache/latest/UserGuide/SelectEngine.html#VersionManagement)), + // Engine and Version (http://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/SelectEngine.html#VersionManagement)), // but you cannot downgrade to an earlier engine version. If you want to use // an earlier engine version, you must delete the existing cluster and create // it anew with the earlier engine version. @@ -9557,7 +10172,7 @@ type ModifyCacheClusterInput struct { // Availability Zone. Only newly created nodes can be located in different Availability // Zones. For guidance on how to move existing Memcached nodes to different // Availability Zones, see the Availability Zone Considerations section of Cache - // Node Considerations for Memcached (http://docs.aws.amazon.com/AmazonElastiCache/latest/UserGuide/CacheNode.Memcached.html). + // Node Considerations for Memcached (http://docs.aws.amazon.com/AmazonElastiCache/latest/mem-ug/CacheNode.Memcached.html). // // Impact of new add/remove requests upon pending requests // @@ -10035,14 +10650,16 @@ type ModifyReplicationGroupInput struct { // replication group. // // Important: You can upgrade to a newer engine version (see Selecting a Cache - // Engine and Version (http://docs.aws.amazon.com/AmazonElastiCache/latest/UserGuide/SelectEngine.html#VersionManagement)), + // Engine and Version (http://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/SelectEngine.html#VersionManagement)), // but you cannot downgrade to an earlier engine version. If you want to use // an earlier engine version, you must delete the existing replication group // and create it anew with the earlier engine version. EngineVersion *string `type:"string"` - // The name of the Node Group (called shard in the console). - NodeGroupId *string `type:"string"` + // Deprecated. This parameter is not used. + // + // Deprecated: NodeGroupId has been deprecated + NodeGroupId *string `deprecated:"true" type:"string"` // The Amazon Resource Name (ARN) of the Amazon SNS topic to which notifications // are sent. @@ -10297,10 +10914,21 @@ type ModifyReplicationGroupShardConfigurationInput struct { NodeGroupCount *int64 `type:"integer" required:"true"` // If the value of NodeGroupCount is less than the current number of node groups - // (shards), NodeGroupsToRemove is a required list of node group ids to remove + // (shards), the NodeGroupsToRemove or NodeGroupsToRetain is a required list + // of node group ids to remove from or retain in the cluster. + // + // ElastiCache for Redis will attempt to remove all node groups listed by NodeGroupsToRemove // from the cluster. NodeGroupsToRemove []*string `locationNameList:"NodeGroupToRemove" type:"list"` + // If the value of NodeGroupCount is less than the current number of node groups + // (shards), the NodeGroupsToRemove or NodeGroupsToRetain is a required list + // of node group ids to remove from or retain in the cluster. + // + // ElastiCache for Redis will attempt to remove all node groups except those + // listed by NodeGroupsToRetain from the cluster. + NodeGroupsToRetain []*string `locationNameList:"NodeGroupToRetain" type:"list"` + // The name of the Redis (cluster mode enabled) cluster (replication group) // on which the shards are to be configured. // @@ -10340,6 +10968,16 @@ func (s *ModifyReplicationGroupShardConfigurationInput) Validate() error { if s.ReplicationGroupId == nil { invalidParams.Add(request.NewErrParamRequired("ReplicationGroupId")) } + if s.ReshardingConfiguration != nil { + for i, v := range s.ReshardingConfiguration { + if v == nil { + continue + } + if err := v.Validate(); err != nil { + invalidParams.AddNested(fmt.Sprintf("%s[%v]", "ReshardingConfiguration", i), err.(request.ErrInvalidParams)) + } + } + } if invalidParams.Len() > 0 { return invalidParams @@ -10365,6 +11003,12 @@ func (s *ModifyReplicationGroupShardConfigurationInput) SetNodeGroupsToRemove(v return s } +// SetNodeGroupsToRetain sets the NodeGroupsToRetain field's value. +func (s *ModifyReplicationGroupShardConfigurationInput) SetNodeGroupsToRetain(v []*string) *ModifyReplicationGroupShardConfigurationInput { + s.NodeGroupsToRetain = v + return s +} + // SetReplicationGroupId sets the ReplicationGroupId field's value. func (s *ModifyReplicationGroupShardConfigurationInput) SetReplicationGroupId(v string) *ModifyReplicationGroupShardConfigurationInput { s.ReplicationGroupId = &v @@ -10472,6 +11116,9 @@ func (s *NodeGroup) SetStatus(v string) *NodeGroup { type NodeGroupConfiguration struct { _ struct{} `type:"structure"` + // The 4-digit id for the node group these configuration values apply to. + NodeGroupId *string `min:"1" type:"string"` + // The Availability Zone where the primary node of this node group (shard) is // launched. PrimaryAvailabilityZone *string `type:"string"` @@ -10501,6 +11148,25 @@ func (s NodeGroupConfiguration) GoString() string { return s.String() } +// Validate inspects the fields of the type to determine if they are valid. +func (s *NodeGroupConfiguration) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "NodeGroupConfiguration"} + if s.NodeGroupId != nil && len(*s.NodeGroupId) < 1 { + invalidParams.Add(request.NewErrParamMinLen("NodeGroupId", 1)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetNodeGroupId sets the NodeGroupId field's value. +func (s *NodeGroupConfiguration) SetNodeGroupId(v string) *NodeGroupConfiguration { + s.NodeGroupId = &v + return s +} + // SetPrimaryAvailabilityZone sets the PrimaryAvailabilityZone field's value. func (s *NodeGroupConfiguration) SetPrimaryAvailabilityZone(v string) *NodeGroupConfiguration { s.PrimaryAvailabilityZone = &v @@ -10536,14 +11202,16 @@ type NodeGroupMember struct { // (0001, 0002, etc.). CacheNodeId *string `type:"string"` - // The role that is currently assigned to the node - primary or replica. + // The role that is currently assigned to the node - primary or replica. This + // member is only applicable for Redis (cluster mode disabled) replication groups. CurrentRole *string `type:"string"` // The name of the Availability Zone in which the node is located. PreferredAvailabilityZone *string `type:"string"` - // Represents the information required for client programs to connect to a cache - // node. + // The information required for client programs to connect to a node for read + // operations. The read endpoint is only applicable on Redis (cluster mode disabled) + // clusters. ReadEndpoint *Endpoint `type:"structure"` } @@ -10712,7 +11380,7 @@ type Parameter struct { // Indicates whether a change to the parameter is applied immediately or requires // a reboot for the change to be applied. You can force a reboot or wait until // the next maintenance window's reboot. For more information, see Rebooting - // a Cluster (http://docs.aws.amazon.com/AmazonElastiCache/latest/UserGuide/Clusters.Rebooting.html). + // a Cluster (http://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/Clusters.Rebooting.html). ChangeType *string `type:"string" enum:"ChangeType"` // The valid data type for the parameter. @@ -10842,7 +11510,7 @@ type PendingModifiedValues struct { _ struct{} `type:"structure"` // A list of cache node IDs that are being removed (or will be removed) from - // the cluster. A node ID is a numeric identifier (0001, 0002, etc.). + // the cluster. A node ID is a 4-digit numeric identifier (0001, 0002, etc.). CacheNodeIdsToRemove []*string `locationNameList:"CacheNodeId" type:"list"` // The cache node type that this cluster or replication group is scaled to. @@ -11161,6 +11829,9 @@ type ReplicationGroup struct { // is created. To enable encryption at-rest on a cluster you must set AtRestEncryptionEnabled // to true when you create a cluster. // + // Required: Only available when creating a replication group in an Amazon VPC + // using redis version 3.2.6 or 4.x. + // // Default: false AtRestEncryptionEnabled *bool `type:"boolean"` @@ -11200,7 +11871,7 @@ type ReplicationGroup struct { // The user supplied description of the replication group. Description *string `type:"string"` - // The identifiers of all the nodes that are part of this replication group. + // The names of all the cache clusters that are part of this replication group. MemberClusters []*string `locationNameList:"ClusterId" type:"list"` // A list of node groups in this replication group. For Redis (cluster mode @@ -11249,6 +11920,9 @@ type ReplicationGroup struct { // is created. To enable in-transit encryption on a cluster you must set TransitEncryptionEnabled // to true when you create a cluster. // + // Required: Only available when creating a replication group in an Amazon VPC + // using redis version 3.2.6 or 4.x. + // // Default: false TransitEncryptionEnabled *bool `type:"boolean"` } @@ -11456,6 +12130,9 @@ type ReservedCacheNode struct { // R3 node types:cache.r3.large, cache.r3.xlarge, cache.r3.2xlarge, cache.r3.4xlarge, // cache.r3.8xlarge // + // R4 node types;cache.r4.large, cache.r4.xlarge, cache.r4.2xlarge, cache.r4.4xlarge, + // cache.r4.8xlarge, cache.r4.16xlarge + // // Previous generation: (not recommended) // // M2 node types:cache.m2.xlarge, cache.m2.2xlarge, cache.m2.4xlarge @@ -11474,10 +12151,13 @@ type ReservedCacheNode struct { // * Redis Append-only files (AOF) functionality is not supported for T1 // or T2 instances. // - // For a complete listing of node types and specifications, see Amazon ElastiCache - // Product Features and Details (http://aws.amazon.com/elasticache/details) - // and either Cache Node Type-Specific Parameters for Memcached (http://docs.aws.amazon.com/AmazonElastiCache/latest/UserGuide/CacheParameterGroups.Memcached.html#ParameterGroups.Memcached.NodeSpecific) - // or Cache Node Type-Specific Parameters for Redis (http://docs.aws.amazon.com/AmazonElastiCache/latest/UserGuide/CacheParameterGroups.Redis.html#ParameterGroups.Redis.NodeSpecific). + // For a complete listing of node types and specifications, see: + // + // * Amazon ElastiCache Product Features and Details (http://aws.amazon.com/elasticache/details) + // + // * Cache Node Type-Specific Parameters for Memcached (http://docs.aws.amazon.com/AmazonElastiCache/latest/mem-ug/ParameterGroups.Memcached.html#ParameterGroups.Memcached.NodeSpecific) + // + // * Cache Node Type-Specific Parameters for Redis (http://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/ParameterGroups.Redis.html#ParameterGroups.Redis.NodeSpecific) CacheNodeType *string `type:"string"` // The duration of the reservation in seconds. @@ -11495,6 +12175,11 @@ type ReservedCacheNode struct { // The recurring price charged to run this reserved cache node. RecurringCharges []*RecurringCharge `locationNameList:"RecurringCharge" type:"list"` + // The Amazon Resource Name (ARN) of the reserved cache node. + // + // Example: arn:aws:elasticache:us-east-1:123456789012:reserved-instance:ri-2017-03-27-08-33-25-582 + ReservationARN *string `type:"string"` + // The unique identifier for the reservation. ReservedCacheNodeId *string `type:"string"` @@ -11563,6 +12248,12 @@ func (s *ReservedCacheNode) SetRecurringCharges(v []*RecurringCharge) *ReservedC return s } +// SetReservationARN sets the ReservationARN field's value. +func (s *ReservedCacheNode) SetReservationARN(v string) *ReservedCacheNode { + s.ReservationARN = &v + return s +} + // SetReservedCacheNodeId sets the ReservedCacheNodeId field's value. func (s *ReservedCacheNode) SetReservedCacheNodeId(v string) *ReservedCacheNode { s.ReservedCacheNodeId = &v @@ -11633,6 +12324,9 @@ type ReservedCacheNodesOffering struct { // R3 node types:cache.r3.large, cache.r3.xlarge, cache.r3.2xlarge, cache.r3.4xlarge, // cache.r3.8xlarge // + // R4 node types;cache.r4.large, cache.r4.xlarge, cache.r4.2xlarge, cache.r4.4xlarge, + // cache.r4.8xlarge, cache.r4.16xlarge + // // Previous generation: (not recommended) // // M2 node types:cache.m2.xlarge, cache.m2.2xlarge, cache.m2.4xlarge @@ -11651,10 +12345,13 @@ type ReservedCacheNodesOffering struct { // * Redis Append-only files (AOF) functionality is not supported for T1 // or T2 instances. // - // For a complete listing of node types and specifications, see Amazon ElastiCache - // Product Features and Details (http://aws.amazon.com/elasticache/details) - // and either Cache Node Type-Specific Parameters for Memcached (http://docs.aws.amazon.com/AmazonElastiCache/latest/UserGuide/CacheParameterGroups.Memcached.html#ParameterGroups.Memcached.NodeSpecific) - // or Cache Node Type-Specific Parameters for Redis (http://docs.aws.amazon.com/AmazonElastiCache/latest/UserGuide/CacheParameterGroups.Redis.html#ParameterGroups.Redis.NodeSpecific). + // For a complete listing of node types and specifications, see: + // + // * Amazon ElastiCache Product Features and Details (http://aws.amazon.com/elasticache/details) + // + // * Cache Node Type-Specific Parameters for Memcached (http://docs.aws.amazon.com/AmazonElastiCache/latest/mem-ug/ParameterGroups.Memcached.html#ParameterGroups.Memcached.NodeSpecific) + // + // * Cache Node Type-Specific Parameters for Redis (http://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/ParameterGroups.Redis.html#ParameterGroups.Redis.NodeSpecific) CacheNodeType *string `type:"string"` // The duration of the offering. in seconds. @@ -11805,6 +12502,9 @@ func (s *ResetCacheParameterGroupInput) SetResetAllParameters(v bool) *ResetCach type ReshardingConfiguration struct { _ struct{} `type:"structure"` + // The 4-digit id for the node group these configuration values apply to. + NodeGroupId *string `min:"1" type:"string"` + // A list of preferred availability zones for the nodes in this cluster. PreferredAvailabilityZones []*string `locationNameList:"AvailabilityZone" type:"list"` } @@ -11819,6 +12519,25 @@ func (s ReshardingConfiguration) GoString() string { return s.String() } +// Validate inspects the fields of the type to determine if they are valid. +func (s *ReshardingConfiguration) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "ReshardingConfiguration"} + if s.NodeGroupId != nil && len(*s.NodeGroupId) < 1 { + invalidParams.Add(request.NewErrParamMinLen("NodeGroupId", 1)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetNodeGroupId sets the NodeGroupId field's value. +func (s *ReshardingConfiguration) SetNodeGroupId(v string) *ReshardingConfiguration { + s.NodeGroupId = &v + return s +} + // SetPreferredAvailabilityZones sets the PreferredAvailabilityZones field's value. func (s *ReshardingConfiguration) SetPreferredAvailabilityZones(v []*string) *ReshardingConfiguration { s.PreferredAvailabilityZones = v @@ -12069,6 +12788,9 @@ type Snapshot struct { // R3 node types:cache.r3.large, cache.r3.xlarge, cache.r3.2xlarge, cache.r3.4xlarge, // cache.r3.8xlarge // + // R4 node types;cache.r4.large, cache.r4.xlarge, cache.r4.2xlarge, cache.r4.4xlarge, + // cache.r4.8xlarge, cache.r4.16xlarge + // // Previous generation: (not recommended) // // M2 node types:cache.m2.xlarge, cache.m2.2xlarge, cache.m2.4xlarge @@ -12087,10 +12809,13 @@ type Snapshot struct { // * Redis Append-only files (AOF) functionality is not supported for T1 // or T2 instances. // - // For a complete listing of node types and specifications, see Amazon ElastiCache - // Product Features and Details (http://aws.amazon.com/elasticache/details) - // and either Cache Node Type-Specific Parameters for Memcached (http://docs.aws.amazon.com/AmazonElastiCache/latest/UserGuide/CacheParameterGroups.Memcached.html#ParameterGroups.Memcached.NodeSpecific) - // or Cache Node Type-Specific Parameters for Redis (http://docs.aws.amazon.com/AmazonElastiCache/latest/UserGuide/CacheParameterGroups.Redis.html#ParameterGroups.Redis.NodeSpecific). + // For a complete listing of node types and specifications, see: + // + // * Amazon ElastiCache Product Features and Details (http://aws.amazon.com/elasticache/details) + // + // * Cache Node Type-Specific Parameters for Memcached (http://docs.aws.amazon.com/AmazonElastiCache/latest/mem-ug/ParameterGroups.Memcached.html#ParameterGroups.Memcached.NodeSpecific) + // + // * Cache Node Type-Specific Parameters for Redis (http://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/ParameterGroups.Redis.html#ParameterGroups.Redis.NodeSpecific) CacheNodeType *string `type:"string"` // The cache parameter group that is associated with the source cluster. @@ -12448,7 +13173,7 @@ type TestFailoverInput struct { // failover on up to 5 node groups in any rolling 24-hour period. // // NodeGroupId is a required field - NodeGroupId *string `type:"string" required:"true"` + NodeGroupId *string `min:"1" type:"string" required:"true"` // The name of the replication group (console: cluster) whose automatic failover // is being tested by this operation. @@ -12473,6 +13198,9 @@ func (s *TestFailoverInput) Validate() error { if s.NodeGroupId == nil { invalidParams.Add(request.NewErrParamRequired("NodeGroupId")) } + if s.NodeGroupId != nil && len(*s.NodeGroupId) < 1 { + invalidParams.Add(request.NewErrParamMinLen("NodeGroupId", 1)) + } if s.ReplicationGroupId == nil { invalidParams.Add(request.NewErrParamRequired("ReplicationGroupId")) } diff --git a/vendor/github.com/aws/aws-sdk-go/service/elasticache/errors.go b/vendor/github.com/aws/aws-sdk-go/service/elasticache/errors.go index 272ee75b800..e35a9ece81a 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/elasticache/errors.go +++ b/vendor/github.com/aws/aws-sdk-go/service/elasticache/errors.go @@ -186,6 +186,12 @@ const ( // The VPC network is in an invalid state. ErrCodeInvalidVPCNetworkStateFault = "InvalidVPCNetworkStateFault" + // ErrCodeNoOperationFault for service response error code + // "NoOperationFault". + // + // The operation was not performed because no changes were required. + ErrCodeNoOperationFault = "NoOperationFault" + // ErrCodeNodeGroupNotFoundFault for service response error code // "NodeGroupNotFoundFault". // @@ -253,6 +259,12 @@ const ( // The requested cache node offering does not exist. ErrCodeReservedCacheNodesOfferingNotFoundFault = "ReservedCacheNodesOfferingNotFound" + // ErrCodeServiceLinkedRoleNotFoundFault for service response error code + // "ServiceLinkedRoleNotFoundFault". + // + // The specified service linked role (SLR) was not found. + ErrCodeServiceLinkedRoleNotFoundFault = "ServiceLinkedRoleNotFoundFault" + // ErrCodeSnapshotAlreadyExistsFault for service response error code // "SnapshotAlreadyExistsFault". // @@ -308,5 +320,7 @@ const ( // ErrCodeTestFailoverNotAvailableFault for service response error code // "TestFailoverNotAvailableFault". + // + // The TestFailover action is not available. ErrCodeTestFailoverNotAvailableFault = "TestFailoverNotAvailableFault" ) diff --git a/vendor/github.com/aws/aws-sdk-go/service/elasticsearchservice/api.go b/vendor/github.com/aws/aws-sdk-go/service/elasticsearchservice/api.go index 4d3c2658be4..5df6dcd9b49 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/elasticsearchservice/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/elasticsearchservice/api.go @@ -2623,6 +2623,9 @@ type CreateElasticsearchDomainInput struct { // a given type of Elasticsearch log. LogPublishingOptions map[string]*LogPublishingOption `type:"map"` + // Specifies the NodeToNodeEncryptionOptions. + NodeToNodeEncryptionOptions *NodeToNodeEncryptionOptions `type:"structure"` + // Option to set time, in UTC format, of the daily automated snapshot. Default // value is 0 hours. SnapshotOptions *SnapshotOptions `type:"structure"` @@ -2723,6 +2726,12 @@ func (s *CreateElasticsearchDomainInput) SetLogPublishingOptions(v map[string]*L return s } +// SetNodeToNodeEncryptionOptions sets the NodeToNodeEncryptionOptions field's value. +func (s *CreateElasticsearchDomainInput) SetNodeToNodeEncryptionOptions(v *NodeToNodeEncryptionOptions) *CreateElasticsearchDomainInput { + s.NodeToNodeEncryptionOptions = v + return s +} + // SetSnapshotOptions sets the SnapshotOptions field's value. func (s *CreateElasticsearchDomainInput) SetSnapshotOptions(v *SnapshotOptions) *CreateElasticsearchDomainInput { s.SnapshotOptions = v @@ -3572,6 +3581,9 @@ type ElasticsearchDomainConfig struct { // Log publishing options for the given domain. LogPublishingOptions *LogPublishingOptionsStatus `type:"structure"` + // Specifies the NodeToNodeEncryptionOptions for the Elasticsearch domain. + NodeToNodeEncryptionOptions *NodeToNodeEncryptionOptionsStatus `type:"structure"` + // Specifies the SnapshotOptions for the Elasticsearch domain. SnapshotOptions *SnapshotOptionsStatus `type:"structure"` @@ -3638,6 +3650,12 @@ func (s *ElasticsearchDomainConfig) SetLogPublishingOptions(v *LogPublishingOpti return s } +// SetNodeToNodeEncryptionOptions sets the NodeToNodeEncryptionOptions field's value. +func (s *ElasticsearchDomainConfig) SetNodeToNodeEncryptionOptions(v *NodeToNodeEncryptionOptionsStatus) *ElasticsearchDomainConfig { + s.NodeToNodeEncryptionOptions = v + return s +} + // SetSnapshotOptions sets the SnapshotOptions field's value. func (s *ElasticsearchDomainConfig) SetSnapshotOptions(v *SnapshotOptionsStatus) *ElasticsearchDomainConfig { s.SnapshotOptions = v @@ -3720,6 +3738,9 @@ type ElasticsearchDomainStatus struct { // Log publishing options for the given domain. LogPublishingOptions map[string]*LogPublishingOption `type:"map"` + // Specifies the status of the NodeToNodeEncryptionOptions. + NodeToNodeEncryptionOptions *NodeToNodeEncryptionOptions `type:"structure"` + // The status of the Elasticsearch domain configuration. True if Amazon Elasticsearch // Service is processing configuration changes. False if the configuration is // active. @@ -3837,6 +3858,12 @@ func (s *ElasticsearchDomainStatus) SetLogPublishingOptions(v map[string]*LogPub return s } +// SetNodeToNodeEncryptionOptions sets the NodeToNodeEncryptionOptions field's value. +func (s *ElasticsearchDomainStatus) SetNodeToNodeEncryptionOptions(v *NodeToNodeEncryptionOptions) *ElasticsearchDomainStatus { + s.NodeToNodeEncryptionOptions = v + return s +} + // SetProcessing sets the Processing field's value. func (s *ElasticsearchDomainStatus) SetProcessing(v bool) *ElasticsearchDomainStatus { s.Processing = &v @@ -4713,6 +4740,70 @@ func (s *LogPublishingOptionsStatus) SetStatus(v *OptionStatus) *LogPublishingOp return s } +// Specifies the node-to-node encryption options. +type NodeToNodeEncryptionOptions struct { + _ struct{} `type:"structure"` + + // Specify true to enable node-to-node encryption. + Enabled *bool `type:"boolean"` +} + +// String returns the string representation +func (s NodeToNodeEncryptionOptions) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s NodeToNodeEncryptionOptions) GoString() string { + return s.String() +} + +// SetEnabled sets the Enabled field's value. +func (s *NodeToNodeEncryptionOptions) SetEnabled(v bool) *NodeToNodeEncryptionOptions { + s.Enabled = &v + return s +} + +// Status of the node-to-node encryption options for the specified Elasticsearch +// domain. +type NodeToNodeEncryptionOptionsStatus struct { + _ struct{} `type:"structure"` + + // Specifies the node-to-node encryption options for the specified Elasticsearch + // domain. + // + // Options is a required field + Options *NodeToNodeEncryptionOptions `type:"structure" required:"true"` + + // Specifies the status of the node-to-node encryption options for the specified + // Elasticsearch domain. + // + // Status is a required field + Status *OptionStatus `type:"structure" required:"true"` +} + +// String returns the string representation +func (s NodeToNodeEncryptionOptionsStatus) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s NodeToNodeEncryptionOptionsStatus) GoString() string { + return s.String() +} + +// SetOptions sets the Options field's value. +func (s *NodeToNodeEncryptionOptionsStatus) SetOptions(v *NodeToNodeEncryptionOptions) *NodeToNodeEncryptionOptionsStatus { + s.Options = v + return s +} + +// SetStatus sets the Status field's value. +func (s *NodeToNodeEncryptionOptionsStatus) SetStatus(v *OptionStatus) *NodeToNodeEncryptionOptionsStatus { + s.Status = v + return s +} + // Provides the current status of the entity. type OptionStatus struct { _ struct{} `type:"structure"` diff --git a/vendor/github.com/aws/aws-sdk-go/service/elastictranscoder/api.go b/vendor/github.com/aws/aws-sdk-go/service/elastictranscoder/api.go index 69f5360c8ea..0b044bcbcad 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/elastictranscoder/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/elastictranscoder/api.go @@ -3225,11 +3225,11 @@ type CreatePipelineInput struct { // The AWS Key Management Service (AWS KMS) key that you want to use with this // pipeline. // - // If you use either S3 or S3-AWS-KMS as your Encryption:Mode, you don't need + // If you use either s3 or s3-aws-kms as your Encryption:Mode, you don't need // to provide a key with your job because a default key, known as an AWS-KMS // key, is created for you automatically. You need to provide an AWS-KMS key // only if you want to use a non-default AWS-KMS key, or if you are using an - // Encryption:Mode of AES-PKCS7, AES-CTR, or AES-GCM. + // Encryption:Mode of aes-cbc-pkcs7, aes-ctr, or aes-gcm. AwsKmsKeyArn *string `type:"string"` // The optional ContentConfig object specifies information about the Amazon @@ -3325,7 +3325,7 @@ type CreatePipelineInput struct { // SNS returned when you created the topic. For more information, see Create // a Topic in the Amazon Simple Notification Service Developer Guide. // - // * Completed: The topic ARN for the Amazon SNS topic that you want to notify + // * Complete: The topic ARN for the Amazon SNS topic that you want to notify // when Elastic Transcoder has finished processing a job in this pipeline. // This is the ARN that Amazon SNS returned when you created the topic. // @@ -3907,20 +3907,20 @@ type Encryption struct { // to use when decrypting your input files or encrypting your output files. // Elastic Transcoder supports the following options: // - // * S3: Amazon S3 creates and manages the keys used for encrypting your + // * s3: Amazon S3 creates and manages the keys used for encrypting your // files. // - // * S3-AWS-KMS: Amazon S3 calls the Amazon Key Management Service, which + // * s3-aws-kms: Amazon S3 calls the Amazon Key Management Service, which // creates and manages the keys that are used for encrypting your files. - // If you specify S3-AWS-KMS and you don't want to use the default key, you + // If you specify s3-aws-kms and you don't want to use the default key, you // must add the AWS-KMS key that you want to use to your pipeline. // - // * AES-CBC-PKCS7: A padded cipher-block mode of operation originally used + // * aes-cbc-pkcs7: A padded cipher-block mode of operation originally used // for HLS files. // - // * AES-CTR: AES Counter Mode. + // * aes-ctr: AES Counter Mode. // - // * AES-GCM: AES Galois Counter Mode, a mode of operation that is an authenticated + // * aes-gcm: AES Galois Counter Mode, a mode of operation that is an authenticated // encryption format, meaning that a file, key, or initialization vector // that has been tampered with fails the decryption process. // @@ -5487,11 +5487,11 @@ type Pipeline struct { // The AWS Key Management Service (AWS KMS) key that you want to use with this // pipeline. // - // If you use either S3 or S3-AWS-KMS as your Encryption:Mode, you don't need + // If you use either s3 or s3-aws-kms as your Encryption:Mode, you don't need // to provide a key with your job because a default key, known as an AWS-KMS // key, is created for you automatically. You need to provide an AWS-KMS key // only if you want to use a non-default AWS-KMS key, or if you are using an - // Encryption:Mode of AES-PKCS7, AES-CTR, or AES-GCM. + // Encryption:Mode of aes-cbc-pkcs7, aes-ctr, or aes-gcm. AwsKmsKeyArn *string `type:"string"` // Information about the Amazon S3 bucket in which you want Elastic Transcoder @@ -5563,7 +5563,7 @@ type Pipeline struct { // SNS) topic that you want to notify when Elastic Transcoder has started // to process the job. // - // * Completed (optional): The Amazon SNS topic that you want to notify when + // * Complete (optional): The Amazon SNS topic that you want to notify when // Elastic Transcoder has finished processing the job. // // * Warning (optional): The Amazon SNS topic that you want to notify when @@ -5809,7 +5809,7 @@ func (s *PipelineOutputConfig) SetStorageClass(v string) *PipelineOutputConfig { // The PlayReady DRM settings, if any, that you want Elastic Transcoder to apply // to the output files associated with this playlist. // -// PlayReady DRM encrypts your media files using AES-CTR encryption. +// PlayReady DRM encrypts your media files using aes-ctr encryption. // // If you use DRM for an HLSv3 playlist, your outputs must have a master playlist. type PlayReadyDrm struct { @@ -6962,11 +6962,11 @@ type UpdatePipelineInput struct { // The AWS Key Management Service (AWS KMS) key that you want to use with this // pipeline. // - // If you use either S3 or S3-AWS-KMS as your Encryption:Mode, you don't need + // If you use either s3 or s3-aws-kms as your Encryption:Mode, you don't need // to provide a key with your job because a default key, known as an AWS-KMS // key, is created for you automatically. You need to provide an AWS-KMS key // only if you want to use a non-default AWS-KMS key, or if you are using an - // Encryption:Mode of AES-PKCS7, AES-CTR, or AES-GCM. + // Encryption:Mode of aes-cbc-pkcs7, aes-ctr, or aes-gcm. AwsKmsKeyArn *string `type:"string"` // The optional ContentConfig object specifies information about the Amazon @@ -7062,7 +7062,7 @@ type UpdatePipelineInput struct { // started to process jobs that are added to this pipeline. This is the ARN // that Amazon SNS returned when you created the topic. // - // * Completed: The topic ARN for the Amazon SNS topic that you want to notify + // * Complete: The topic ARN for the Amazon SNS topic that you want to notify // when Elastic Transcoder has finished processing a job. This is the ARN // that Amazon SNS returned when you created the topic. // @@ -7245,7 +7245,7 @@ type UpdatePipelineNotificationsInput struct { // started to process jobs that are added to this pipeline. This is the ARN // that Amazon SNS returned when you created the topic. // - // * Completed: The topic ARN for the Amazon SNS topic that you want to notify + // * Complete: The topic ARN for the Amazon SNS topic that you want to notify // when Elastic Transcoder has finished processing a job. This is the ARN // that Amazon SNS returned when you created the topic. // diff --git a/vendor/github.com/aws/aws-sdk-go/service/fms/api.go b/vendor/github.com/aws/aws-sdk-go/service/fms/api.go index 68169facc30..86436aab389 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/fms/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/fms/api.go @@ -60,13 +60,13 @@ func (c *FMS) AssociateAdminAccountRequest(input *AssociateAdminAccountInput) (r // AssociateAdminAccount API operation for Firewall Management Service. // // Sets the AWS Firewall Manager administrator account. AWS Firewall Manager -// must be associated with a master account in AWS Organizations or associated +// must be associated with the master account your AWS organization or associated // with a member account that has the appropriate permissions. If the account // ID that you submit is not an AWS Organizations master account, AWS Firewall // Manager will set the appropriate permissions for the given member account. // // The account that you associate with AWS Firewall Manager is called the AWS -// Firewall manager administrator account. +// Firewall Manager administrator account. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about @@ -717,6 +717,9 @@ func (c *FMS) GetPolicyRequest(input *GetPolicyInput) (req *request.Request, out // The operation failed because of a system problem, even though the request // was valid. Retry your request. // +// * ErrCodeInvalidTypeException "InvalidTypeException" +// The value of the Type parameter is invalid. +// // See also, https://docs.aws.amazon.com/goto/WebAPI/fms-2018-01-01/GetPolicy func (c *FMS) GetPolicy(input *GetPolicyInput) (*GetPolicyOutput, error) { req, out := c.GetPolicyRequest(input) @@ -824,6 +827,93 @@ func (c *FMS) ListComplianceStatusWithContext(ctx aws.Context, input *ListCompli return out, req.Send() } +const opListMemberAccounts = "ListMemberAccounts" + +// ListMemberAccountsRequest generates a "aws/request.Request" representing the +// client's request for the ListMemberAccounts operation. The "output" return +// value will be populated with the request's response once the request completes +// successfuly. +// +// Use "Send" method on the returned Request to send the API call to the service. +// the "output" return value is not valid until after Send returns without error. +// +// See ListMemberAccounts for more information on using the ListMemberAccounts +// API call, and error handling. +// +// This method is useful when you want to inject custom logic or configuration +// into the SDK's request lifecycle. Such as custom headers, or retry logic. +// +// +// // Example sending a request using the ListMemberAccountsRequest method. +// req, resp := client.ListMemberAccountsRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/fms-2018-01-01/ListMemberAccounts +func (c *FMS) ListMemberAccountsRequest(input *ListMemberAccountsInput) (req *request.Request, output *ListMemberAccountsOutput) { + op := &request.Operation{ + Name: opListMemberAccounts, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &ListMemberAccountsInput{} + } + + output = &ListMemberAccountsOutput{} + req = c.newRequest(op, input, output) + return +} + +// ListMemberAccounts API operation for Firewall Management Service. +// +// Returns a MemberAccounts object that lists the member accounts in the administrator's +// AWS organization. +// +// The ListMemberAccounts must be submitted by the account that is set as the +// AWS Firewall Manager administrator. +// +// Returns awserr.Error for service API and SDK errors. Use runtime type assertions +// with awserr.Error's Code and Message methods to get detailed information about +// the error. +// +// See the AWS API reference guide for Firewall Management Service's +// API operation ListMemberAccounts for usage and error information. +// +// Returned Error Codes: +// * ErrCodeResourceNotFoundException "ResourceNotFoundException" +// The specified resource was not found. +// +// * ErrCodeInternalErrorException "InternalErrorException" +// The operation failed because of a system problem, even though the request +// was valid. Retry your request. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/fms-2018-01-01/ListMemberAccounts +func (c *FMS) ListMemberAccounts(input *ListMemberAccountsInput) (*ListMemberAccountsOutput, error) { + req, out := c.ListMemberAccountsRequest(input) + return out, req.Send() +} + +// ListMemberAccountsWithContext is the same as ListMemberAccounts with the addition of +// the ability to pass a context and additional request options. +// +// See ListMemberAccounts for details on how to use this API operation. +// +// The context must be non-nil and will be used for request cancellation. If +// the context is nil a panic will occur. In the future the SDK may create +// sub-contexts for http.Requests. See https://golang.org/pkg/context/ +// for more information on using Contexts. +func (c *FMS) ListMemberAccountsWithContext(ctx aws.Context, input *ListMemberAccountsInput, opts ...request.Option) (*ListMemberAccountsOutput, error) { + req, out := c.ListMemberAccountsRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opListPolicies = "ListPolicies" // ListPoliciesRequest generates a "aws/request.Request" representing the @@ -1074,10 +1164,19 @@ func (c *FMS) PutPolicyRequest(input *PutPolicyInput) (req *request.Request, out // * ErrCodeInvalidInputException "InvalidInputException" // The parameters of the request were invalid. // +// * ErrCodeLimitExceededException "LimitExceededException" +// The operation exceeds a resource limit, for example, the maximum number of +// policy objects that you can create for an AWS account. For more information, +// see Firewall Manager Limits (http://docs.aws.amazon.com/waf/latest/developerguide/fms-limits.html) +// in the AWS WAF Developer Guide. +// // * ErrCodeInternalErrorException "InternalErrorException" // The operation failed because of a system problem, even though the request // was valid. Retry your request. // +// * ErrCodeInvalidTypeException "InvalidTypeException" +// The value of the Type parameter is invalid. +// // See also, https://docs.aws.amazon.com/goto/WebAPI/fms-2018-01-01/PutPolicy func (c *FMS) PutPolicy(input *PutPolicyInput) (*PutPolicyOutput, error) { req, out := c.PutPolicyRequest(input) @@ -1379,6 +1478,9 @@ type GetAdminAccountOutput struct { // The AWS account that is set as the AWS Firewall Manager administrator. AdminAccount *string `min:"1" type:"string"` + + // The status of the AWS account that you set as the AWS Firewall Manager administrator. + RoleStatus *string `type:"string" enum:"AccountRoleStatus"` } // String returns the string representation @@ -1397,6 +1499,12 @@ func (s *GetAdminAccountOutput) SetAdminAccount(v string) *GetAdminAccountOutput return s } +// SetRoleStatus sets the RoleStatus field's value. +func (s *GetAdminAccountOutput) SetRoleStatus(v string) *GetAdminAccountOutput { + s.RoleStatus = &v + return s +} + type GetComplianceDetailInput struct { _ struct{} `type:"structure"` @@ -1710,6 +1818,98 @@ func (s *ListComplianceStatusOutput) SetPolicyComplianceStatusList(v []*PolicyCo return s } +type ListMemberAccountsInput struct { + _ struct{} `type:"structure"` + + // Specifies the number of member account IDs that you want AWS Firewall Manager + // to return for this request. If you have more IDs than the number that you + // specify for MaxResults, the response includes a NextToken value that you + // can use to get another batch of member account IDs. The maximum value for + // MaxResults is 100. + MaxResults *int64 `min:"1" type:"integer"` + + // If you specify a value for MaxResults and you have more account IDs than + // the number that you specify for MaxResults, AWS Firewall Manager returns + // a NextToken value in the response that allows you to list another group of + // IDs. For the second and subsequent ListMemberAccountsRequest requests, specify + // the value of NextToken from the previous response to get information about + // another batch of member account IDs. + NextToken *string `min:"1" type:"string"` +} + +// String returns the string representation +func (s ListMemberAccountsInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s ListMemberAccountsInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *ListMemberAccountsInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "ListMemberAccountsInput"} + if s.MaxResults != nil && *s.MaxResults < 1 { + invalidParams.Add(request.NewErrParamMinValue("MaxResults", 1)) + } + if s.NextToken != nil && len(*s.NextToken) < 1 { + invalidParams.Add(request.NewErrParamMinLen("NextToken", 1)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetMaxResults sets the MaxResults field's value. +func (s *ListMemberAccountsInput) SetMaxResults(v int64) *ListMemberAccountsInput { + s.MaxResults = &v + return s +} + +// SetNextToken sets the NextToken field's value. +func (s *ListMemberAccountsInput) SetNextToken(v string) *ListMemberAccountsInput { + s.NextToken = &v + return s +} + +type ListMemberAccountsOutput struct { + _ struct{} `type:"structure"` + + // An array of account IDs. + MemberAccounts []*string `type:"list"` + + // If you have more member account IDs than the number that you specified for + // MaxResults in the request, the response includes a NextToken value. To list + // more IDs, submit another ListMemberAccounts request, and specify the NextToken + // value from the response in the NextToken value in the next request. + NextToken *string `min:"1" type:"string"` +} + +// String returns the string representation +func (s ListMemberAccountsOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s ListMemberAccountsOutput) GoString() string { + return s.String() +} + +// SetMemberAccounts sets the MemberAccounts field's value. +func (s *ListMemberAccountsOutput) SetMemberAccounts(v []*string) *ListMemberAccountsOutput { + s.MemberAccounts = v + return s +} + +// SetNextToken sets the NextToken field's value. +func (s *ListMemberAccountsOutput) SetNextToken(v string) *ListMemberAccountsOutput { + s.NextToken = &v + return s +} + type ListPoliciesInput struct { _ struct{} `type:"structure"` @@ -1806,6 +2006,15 @@ func (s *ListPoliciesOutput) SetPolicyList(v []*PolicySummary) *ListPoliciesOutp type Policy struct { _ struct{} `type:"structure"` + // Specifies the AWS account IDs to exclude from the policy. The IncludeMap + // values are evaluated first, with all of the appropriate account IDs added + // to the policy. Then the accounts listed in ExcludeMap are removed, resulting + // in the final list of accounts to add to the policy. + // + // The key to the map is ACCOUNT. For example, a valid ExcludeMap would be {“ACCOUNT” + // : [“accountID1”, “accountID2”]}. + ExcludeMap map[string][]*string `type:"map"` + // If set to True, resources with the tags that are specified in the ResourceTag // array are not protected by the policy. If set to False, and the ResourceTag // array is not null, only resources with the specified tags are associated @@ -1814,6 +2023,15 @@ type Policy struct { // ExcludeResourceTags is a required field ExcludeResourceTags *bool `type:"boolean" required:"true"` + // Specifies the AWS account IDs to include in the policy. If IncludeMap is + // null, all accounts in the AWS Organization are included in the policy. If + // IncludeMap is not null, only values listed in IncludeMap will be included + // in the policy. + // + // The key to the map is ACCOUNT. For example, a valid IncludeMap would be {“ACCOUNT” + // : [“accountID1”, “accountID2”]}. + IncludeMap map[string][]*string `type:"map"` + // The ID of the AWS Firewall Manager policy. PolicyId *string `min:"36" type:"string"` @@ -1912,12 +2130,24 @@ func (s *Policy) Validate() error { return nil } +// SetExcludeMap sets the ExcludeMap field's value. +func (s *Policy) SetExcludeMap(v map[string][]*string) *Policy { + s.ExcludeMap = v + return s +} + // SetExcludeResourceTags sets the ExcludeResourceTags field's value. func (s *Policy) SetExcludeResourceTags(v bool) *Policy { s.ExcludeResourceTags = &v return s } +// SetIncludeMap sets the IncludeMap field's value. +func (s *Policy) SetIncludeMap(v map[string][]*string) *Policy { + s.IncludeMap = v + return s +} + // SetPolicyId sets the PolicyId field's value. func (s *Policy) SetPolicyId(v string) *Policy { s.PolicyId = &v @@ -1974,6 +2204,12 @@ type PolicyComplianceDetail struct { // out-of-date. ExpiredAt *time.Time `type:"timestamp"` + // Details about problems with dependent services, such as AWS WAF or AWS Config, + // that are causing a resource to be non-compliant. The details include the + // name of the dependent service and the error message recieved indicating the + // problem with the service. + IssueInfoMap map[string]*string `type:"map"` + // The AWS account ID. MemberAccount *string `min:"1" type:"string"` @@ -2009,6 +2245,12 @@ func (s *PolicyComplianceDetail) SetExpiredAt(v time.Time) *PolicyComplianceDeta return s } +// SetIssueInfoMap sets the IssueInfoMap field's value. +func (s *PolicyComplianceDetail) SetIssueInfoMap(v map[string]*string) *PolicyComplianceDetail { + s.IssueInfoMap = v + return s +} + // SetMemberAccount sets the MemberAccount field's value. func (s *PolicyComplianceDetail) SetMemberAccount(v string) *PolicyComplianceDetail { s.MemberAccount = &v @@ -2042,6 +2284,12 @@ type PolicyComplianceStatus struct { // An array of EvaluationResult objects. EvaluationResults []*EvaluationResult `type:"list"` + // Details about problems with dependent services, such as AWS WAF or AWS Config, + // that are causing a resource to be non-compliant. The details include the + // name of the dependent service and the error message recieved indicating the + // problem with the service. + IssueInfoMap map[string]*string `type:"map"` + // Time stamp of the last update to the EvaluationResult objects. LastUpdated *time.Time `type:"timestamp"` @@ -2074,6 +2322,12 @@ func (s *PolicyComplianceStatus) SetEvaluationResults(v []*EvaluationResult) *Po return s } +// SetIssueInfoMap sets the IssueInfoMap field's value. +func (s *PolicyComplianceStatus) SetIssueInfoMap(v map[string]*string) *PolicyComplianceStatus { + s.IssueInfoMap = v + return s +} + // SetLastUpdated sets the LastUpdated field's value. func (s *PolicyComplianceStatus) SetLastUpdated(v time.Time) *PolicyComplianceStatus { s.LastUpdated = &v @@ -2441,6 +2695,36 @@ func (s *SecurityServicePolicyData) SetType(v string) *SecurityServicePolicyData return s } +const ( + // AccountRoleStatusReady is a AccountRoleStatus enum value + AccountRoleStatusReady = "READY" + + // AccountRoleStatusCreating is a AccountRoleStatus enum value + AccountRoleStatusCreating = "CREATING" + + // AccountRoleStatusPendingDeletion is a AccountRoleStatus enum value + AccountRoleStatusPendingDeletion = "PENDING_DELETION" + + // AccountRoleStatusDeleting is a AccountRoleStatus enum value + AccountRoleStatusDeleting = "DELETING" + + // AccountRoleStatusDeleted is a AccountRoleStatus enum value + AccountRoleStatusDeleted = "DELETED" +) + +const ( + // CustomerPolicyScopeIdTypeAccount is a CustomerPolicyScopeIdType enum value + CustomerPolicyScopeIdTypeAccount = "ACCOUNT" +) + +const ( + // DependentServiceNameAwsconfig is a DependentServiceName enum value + DependentServiceNameAwsconfig = "AWSCONFIG" + + // DependentServiceNameAwswaf is a DependentServiceName enum value + DependentServiceNameAwswaf = "AWSWAF" +) + const ( // PolicyComplianceStatusTypeCompliant is a PolicyComplianceStatusType enum value PolicyComplianceStatusTypeCompliant = "COMPLIANT" diff --git a/vendor/github.com/aws/aws-sdk-go/service/fms/errors.go b/vendor/github.com/aws/aws-sdk-go/service/fms/errors.go index f0a64c975a4..c63fd3c5b80 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/fms/errors.go +++ b/vendor/github.com/aws/aws-sdk-go/service/fms/errors.go @@ -25,6 +25,12 @@ const ( // you submitted was already set as the AWS Firewall Manager administrator. ErrCodeInvalidOperationException = "InvalidOperationException" + // ErrCodeInvalidTypeException for service response error code + // "InvalidTypeException". + // + // The value of the Type parameter is invalid. + ErrCodeInvalidTypeException = "InvalidTypeException" + // ErrCodeLimitExceededException for service response error code // "LimitExceededException". // diff --git a/vendor/github.com/aws/aws-sdk-go/service/organizations/api.go b/vendor/github.com/aws/aws-sdk-go/service/organizations/api.go index 104582b80fc..9873d5e510c 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/organizations/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/organizations/api.go @@ -68,7 +68,7 @@ func (c *Organizations) AcceptHandshakeRequest(input *AcceptHandshakeInput) (req // The user who calls the API for an invitation to join must have the organizations:AcceptHandshake // permission. If you enabled all features in the organization, then the // user must also have the iam:CreateServiceLinkedRole permission so that -// Organizations can create the required service-linked role named OrgsServiceLinkedRoleName. +// Organizations can create the required service-linked role named AWSServiceRoleForOrganizations. // For more information, see AWS Organizations and Service-Linked Roles (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_integration_services.html#orgs_integration_service-linked-roles) // in the AWS Organizations User Guide. // @@ -101,7 +101,7 @@ func (c *Organizations) AcceptHandshakeRequest(input *AcceptHandshakeInput) (req // in the IAM User Guide. // // * ErrCodeAWSOrganizationsNotInUseException "AWSOrganizationsNotInUseException" -// Your account is not a member of an organization. To make this request, you +// Your account isn't a member of an organization. To make this request, you // must use the credentials of an account that belongs to an organization. // // * ErrCodeHandshakeConstraintViolationException "HandshakeConstraintViolationException" @@ -112,15 +112,15 @@ func (c *Organizations) AcceptHandshakeRequest(input *AcceptHandshakeInput) (req // specific API or operation: // // * ACCOUNT_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the limit on -// the number of accounts in an organization. Note: deleted and closed accounts -// still count toward your limit. +// the number of accounts in an organization. Note that deleted and closed +// accounts still count toward your limit. // // If you get this exception immediately after creating the organization, wait // one hour and try again. If after an hour it continues to fail with this -// error, contact AWS Customer Support (https://console.aws.amazon.com/support/home#/). +// error, contact AWS Support (https://console.aws.amazon.com/support/home#/). // // * HANDSHAKE_RATE_LIMIT_EXCEEDED: You attempted to exceed the number of -// handshakes you can send in one day. +// handshakes that you can send in one day. // // * ALREADY_IN_AN_ORGANIZATION: The handshake request is invalid because // the invited account is already a member of an organization. @@ -128,13 +128,13 @@ func (c *Organizations) AcceptHandshakeRequest(input *AcceptHandshakeInput) (req // * ORGANIZATION_ALREADY_HAS_ALL_FEATURES: The handshake request is invalid // because the organization has already enabled all features. // -// * INVITE_DISABLED_DURING_ENABLE_ALL_FEATURES: You cannot issue new invitations -// to join an organization while it is in the process of enabling all features. +// * INVITE_DISABLED_DURING_ENABLE_ALL_FEATURES: You can't issue new invitations +// to join an organization while it's in the process of enabling all features. // You can resume inviting accounts after you finalize the process when all // accounts have agreed to the change. // -// * PAYMENT_INSTRUMENT_REQUIRED: You cannot complete the operation with -// an account that does not have a payment instrument, such as a credit card, +// * PAYMENT_INSTRUMENT_REQUIRED: You can't complete the operation with an +// account that doesn't have a payment instrument, such as a credit card, // associated with it. // // * ORGANIZATION_FROM_DIFFERENT_SELLER_OF_RECORD: The request failed because @@ -151,7 +151,7 @@ func (c *Organizations) AcceptHandshakeRequest(input *AcceptHandshakeInput) (req // // * ErrCodeInvalidHandshakeTransitionException "InvalidHandshakeTransitionException" // You can't perform the operation on the handshake in its current state. For -// example, you can't cancel a handshake that was already accepted, or accept +// example, you can't cancel a handshake that was already accepted or accept // a handshake that was already declined. // // * ErrCodeHandshakeAlreadyInStateException "HandshakeAlreadyInStateException" @@ -167,11 +167,11 @@ func (c *Organizations) AcceptHandshakeRequest(input *AcceptHandshakeInput) (req // specific API or operation: // // * IMMUTABLE_POLICY: You specified a policy that is managed by AWS and -// cannot be modified. +// can't be modified. // // * INPUT_REQUIRED: You must include a value for all required parameters. // -// * INVALID_ENUM: You specified a value that is not valid for that parameter. +// * INVALID_ENUM: You specified a value that isn't valid for that parameter. // // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. @@ -191,11 +191,11 @@ func (c *Organizations) AcceptHandshakeRequest(input *AcceptHandshakeInput) (req // * INVALID_PATTERN_TARGET_ID: You specified a policy target ID that doesn't // match the required pattern. // -// * INVALID_ROLE_NAME: You provided a role name that is not valid. A role -// name can’t begin with the reserved prefix 'AWSServiceRoleFor'. +// * INVALID_ROLE_NAME: You provided a role name that isn't valid. A role +// name can't begin with the reserved prefix AWSServiceRoleFor. // -// * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid ARN for the -// organization. +// * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid Amazon Resource +// Name (ARN) for the organization. // // * INVALID_SYNTAX_POLICY_ID: You specified an invalid policy ID. // @@ -230,9 +230,9 @@ func (c *Organizations) AcceptHandshakeRequest(input *AcceptHandshakeInput) (req // protect against denial-of-service attacks. Try again later. // // * ErrCodeAccessDeniedForDependencyException "AccessDeniedForDependencyException" -// The operation you attempted requires you to have the iam:CreateServiceLinkedRole -// so that Organizations can create the required service-linked role. You do -// not have that permission. +// The operation that you attempted requires you to have the iam:CreateServiceLinkedRole +// so that AWS Organizations can create the required service-linked role. You +// don't have that permission. // // See also, https://docs.aws.amazon.com/goto/WebAPI/organizations-2016-11-28/AcceptHandshake func (c *Organizations) AcceptHandshake(input *AcceptHandshakeInput) (*AcceptHandshakeOutput, error) { @@ -358,7 +358,7 @@ func (c *Organizations) AttachPolicyRequest(input *AttachPolicyInput) (req *requ // in the IAM User Guide. // // * ErrCodeAWSOrganizationsNotInUseException "AWSOrganizationsNotInUseException" -// Your account is not a member of an organization. To make this request, you +// Your account isn't a member of an organization. To make this request, you // must use the credentials of an account that belongs to an organization. // // * ErrCodeConcurrentModificationException "ConcurrentModificationException" @@ -367,40 +367,42 @@ func (c *Organizations) AttachPolicyRequest(input *AttachPolicyInput) (req *requ // // * ErrCodeConstraintViolationException "ConstraintViolationException" // Performing this operation violates a minimum or maximum value limit. For -// example, attempting to removing the last SCP from an OU or root, inviting -// or creating too many accounts to the organization, or attaching too many -// policies to an account, OU, or root. This exception includes a reason that -// contains additional information about the violated limit: +// example, attempting to removing the last service control policy (SCP) from +// an OU or root, inviting or creating too many accounts to the organization, +// or attaching too many policies to an account, OU, or root. This exception +// includes a reason that contains additional information about the violated +// limit. // // Some of the reasons in the following list might not be applicable to this // specific API or operation: // -// ACCOUNT_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the limit on the number -// of accounts in an organization. If you need more accounts, contact AWS Support -// to request an increase in your limit. +// * ACCOUNT_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the limit on +// the number of accounts in an organization. If you need more accounts, +// contactAWS Support (https://console.aws.amazon.com/support/home#/) to +// request an increase in your limit. // -// Or, The number of invitations that you tried to send would cause you to exceed -// the limit of accounts in your organization. Send fewer invitations, or contact -// AWS Support to request an increase in the number of accounts. +// Or the number of invitations that you tried to send would cause you to exceed +// the limit of accounts in your organization. Send fewer invitations or +// contact AWS Support to request an increase in the number of accounts. // -// Note: deleted and closed accounts still count toward your limit. +// Deleted and closed accounts still count toward your limit. // // If you get receive this exception when running a command immediately after -// creating the organization, wait one hour and try again. If after an hour -// it continues to fail with this error, contact AWS Customer Support (https://console.aws.amazon.com/support/home#/). +// creating the organization, wait one hour and try again. If after an hour +// it continues to fail with this error, contact AWS Support (https://console.aws.amazon.com/support/home#/). // // * HANDSHAKE_RATE_LIMIT_EXCEEDED: You attempted to exceed the number of -// handshakes you can send in one day. +// handshakes that you can send in one day. // -// * OU_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the number of organizational -// units you can have in an organization. +// * OU_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the number of OUs +// that you can have in an organization. // -// * OU_DEPTH_LIMIT_EXCEEDED: You attempted to create an organizational unit -// tree that is too many levels deep. +// * OU_DEPTH_LIMIT_EXCEEDED: You attempted to create an OU tree that is +// too many levels deep. // // * ORGANIZATION_NOT_IN_ALL_FEATURES_MODE: You attempted to perform an operation // that requires the organization to be configured to support all features. -// An organization that supports consolidated billing features only cannot +// An organization that supports only consolidated billing features can't // perform this operation. // // * POLICY_NUMBER_LIMIT_EXCEEDED. You attempted to exceed the number of @@ -415,23 +417,24 @@ func (c *Organizations) AttachPolicyRequest(input *AttachPolicyInput) (req *requ // minimum number of policies of a certain type required. // // * ACCOUNT_CANNOT_LEAVE_WITHOUT_EULA: You attempted to remove an account -// from the organization that does not yet have enough information to exist -// as a stand-alone account. This account requires you to first agree to -// the AWS Customer Agreement. Follow the steps at To leave an organization -// when all required account information has not yet been provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) +// from the organization that doesn't yet have enough information to exist +// as a standalone account. This account requires you to first agree to the +// AWS Customer Agreement. Follow the steps at To leave an organization when +// all required account information has not yet been provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) // in the AWS Organizations User Guide. // // * ACCOUNT_CANNOT_LEAVE_WITHOUT_PHONE_VERIFICATION: You attempted to remove -// an account from the organization that does not yet have enough information -// to exist as a stand-alone account. This account requires you to first -// complete phone verification. Follow the steps at To leave an organization -// when all required account information has not yet been provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) +// an account from the organization that doesn't yet have enough information +// to exist as a standalone account. This account requires you to first complete +// phone verification. Follow the steps at To leave an organization when +// all required account information has not yet been provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) // in the AWS Organizations User Guide. // // * MASTER_ACCOUNT_PAYMENT_INSTRUMENT_REQUIRED: To create an organization -// with this account, you first must associate a payment instrument, such -// as a credit card, with the account. Follow the steps at To leave an organization -// when all required account information has not yet been provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) +// with this master account, you first must associate a payment instrument, +// such as a credit card, with the account. Follow the steps at To leave +// an organization when all required account information has not yet been +// provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) // in the AWS Organizations User Guide. // // * MEMBER_ACCOUNT_PAYMENT_INSTRUMENT_REQUIRED: To complete this operation @@ -467,11 +470,11 @@ func (c *Organizations) AttachPolicyRequest(input *AttachPolicyInput) (req *requ // specific API or operation: // // * IMMUTABLE_POLICY: You specified a policy that is managed by AWS and -// cannot be modified. +// can't be modified. // // * INPUT_REQUIRED: You must include a value for all required parameters. // -// * INVALID_ENUM: You specified a value that is not valid for that parameter. +// * INVALID_ENUM: You specified a value that isn't valid for that parameter. // // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. @@ -491,11 +494,11 @@ func (c *Organizations) AttachPolicyRequest(input *AttachPolicyInput) (req *requ // * INVALID_PATTERN_TARGET_ID: You specified a policy target ID that doesn't // match the required pattern. // -// * INVALID_ROLE_NAME: You provided a role name that is not valid. A role -// name can’t begin with the reserved prefix 'AWSServiceRoleFor'. +// * INVALID_ROLE_NAME: You provided a role name that isn't valid. A role +// name can't begin with the reserved prefix AWSServiceRoleFor. // -// * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid ARN for the -// organization. +// * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid Amazon Resource +// Name (ARN) for the organization. // // * INVALID_SYNTAX_POLICY_ID: You specified an invalid policy ID. // @@ -521,7 +524,7 @@ func (c *Organizations) AttachPolicyRequest(input *AttachPolicyInput) (req *requ // We can't find a policy with the PolicyId that you specified. // // * ErrCodePolicyTypeNotEnabledException "PolicyTypeNotEnabledException" -// The specified policy type is not currently enabled in this root. You cannot +// The specified policy type isn't currently enabled in this root. You can't // attach policies of the specified type to entities in a root until you enable // that type in the root. For more information, see Enabling All Features in // Your Organization (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_org_support-all-features.html) @@ -638,7 +641,7 @@ func (c *Organizations) CancelHandshakeRequest(input *CancelHandshakeInput) (req // // * ErrCodeInvalidHandshakeTransitionException "InvalidHandshakeTransitionException" // You can't perform the operation on the handshake in its current state. For -// example, you can't cancel a handshake that was already accepted, or accept +// example, you can't cancel a handshake that was already accepted or accept // a handshake that was already declined. // // * ErrCodeHandshakeAlreadyInStateException "HandshakeAlreadyInStateException" @@ -654,11 +657,11 @@ func (c *Organizations) CancelHandshakeRequest(input *CancelHandshakeInput) (req // specific API or operation: // // * IMMUTABLE_POLICY: You specified a policy that is managed by AWS and -// cannot be modified. +// can't be modified. // // * INPUT_REQUIRED: You must include a value for all required parameters. // -// * INVALID_ENUM: You specified a value that is not valid for that parameter. +// * INVALID_ENUM: You specified a value that isn't valid for that parameter. // // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. @@ -678,11 +681,11 @@ func (c *Organizations) CancelHandshakeRequest(input *CancelHandshakeInput) (req // * INVALID_PATTERN_TARGET_ID: You specified a policy target ID that doesn't // match the required pattern. // -// * INVALID_ROLE_NAME: You provided a role name that is not valid. A role -// name can’t begin with the reserved prefix 'AWSServiceRoleFor'. +// * INVALID_ROLE_NAME: You provided a role name that isn't valid. A role +// name can't begin with the reserved prefix AWSServiceRoleFor. // -// * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid ARN for the -// organization. +// * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid Amazon Resource +// Name (ARN) for the organization. // // * INVALID_SYNTAX_POLICY_ID: You specified an invalid policy ID. // @@ -780,57 +783,57 @@ func (c *Organizations) CreateAccountRequest(input *CreateAccountInput) (req *re // // Creates an AWS account that is automatically a member of the organization // whose credentials made the request. This is an asynchronous request that -// AWS performs in the background. If you want to check the status of the request -// later, you need the OperationId response element from this operation to provide -// as a parameter to the DescribeCreateAccountStatus operation. -// -// The user who calls the API for an invitation to join must have the organizations:CreateAccount -// permission. If you enabled all features in the organization, then the user -// must also have the iam:CreateServiceLinkedRole permission so that Organizations -// can create the required service-linked role named OrgsServiceLinkedRoleName. -// For more information, see AWS Organizations and Service-Linked Roles (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_integration_services.html#orgs_integration_service-linked-roles) -// in the AWS Organizations User Guide. +// AWS performs in the background. Because CreateAccount operates asynchronously, +// it can return a successful completion message even though account initialization +// might still be in progress. You might need to wait a few minutes before you +// can successfully access the account. To check the status of the request, +// do one of the following: +// +// * Use the OperationId response element from this operation to provide +// as a parameter to the DescribeCreateAccountStatus operation. +// +// * Check the AWS CloudTrail log for the CreateAccountResult event. For +// information on using AWS CloudTrail with Organizations, see Monitoring +// the Activity in Your Organization (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_monitoring.html) +// in the AWS Organizations User Guide. +// +// The user who calls the API to create an account must have the organizations:CreateAccountpermission. If you enabled all features in the organization, AWS Organizations +// will create the required service-linked role named AWSServiceRoleForOrganizations. For more information, see AWS Organizations and Service-Linked Roles (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_integrate_services.html#orgs_integrate_services-using_slrs)in the AWS Organizations User Guide. // -// The user in the master account who calls this API must also have the iam:CreateRole -// permission because AWS Organizations preconfigures the new member account -// with a role (named OrganizationAccountAccessRole by default) that grants -// users in the master account administrator permissions in the new member account. -// Principals in the master account can assume the role. AWS Organizations clones -// the company name and address information for the new account from the organization's -// master account. +// AWS Organizations preconfigures the new member account with a role (named +// OrganizationAccountAccessRoleby default) that grants users in the master account administrator permissions +// in the new member account. Principals in the master account can assume the +// role. AWS Organizations clones the company name and address information for +// the new account from the organization's master account. // // This operation can be called only from the organization's master account. // // For more information about creating accounts, see Creating an AWS Account -// in Your Organization (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_create.html) -// in the AWS Organizations User Guide. +// in Your Organization (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_create.html)in the AWS Organizations User Guide. // // When you create an account in an organization using the AWS Organizations // console, API, or CLI commands, the information required for the account to // operate as a standalone account, such as a payment method and signing the -// End User Licence Agreement (EULA) is not automatically collected. If you +// end user license agreement (EULA) is not automatically collected. If you // must remove an account from your organization later, you can do so only after // you provide the missing information. Follow the steps at To leave an organization -// when all required account information has not yet been provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) +// as a member account (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) // in the AWS Organizations User Guide. // // If you get an exception that indicates that you exceeded your account limits -// for the organization or that the operation failed because your organization -// is still initializing, wait one hour and then try again. If the error persists -// after an hour, then contact AWS Customer Support (https://console.aws.amazon.com/support/home#/). +// for the organization, contact AWS Support (https://console.aws.amazon.com/support/home#/). // -// Because CreateAccount operates asynchronously, it can return a successful -// completion message even though account initialization might still be in progress. -// You might need to wait a few minutes before you can successfully access the -// account. +// If you get an exception that indicates that the operation failed because +// your organization is still initializing, wait one hour and then try again. +// If the error persists, contact AWS Support (https://console.aws.amazon.com/support/home#/). // // When you create a member account with this operation, you can choose whether // to create the account with the IAM User and Role Access to Billing Information // switch enabled. If you enable it, IAM users and roles that have appropriate // permissions can view billing information for the account. If you disable -// this, then only the account root user can access billing information. For -// information about how to disable this for an account, see Granting Access -// to Your Billing Information and Tools (http://docs.aws.amazon.com/awsaccountbilling/latest/aboutv2/grantaccess.html). +// it, only the account root user can access billing information. For information +// about how to disable this switch for an account, see Granting Access to Your +// Billing Information and Tools (http://docs.aws.amazon.com/awsaccountbilling/latest/aboutv2/grantaccess.html). // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about @@ -848,7 +851,7 @@ func (c *Organizations) CreateAccountRequest(input *CreateAccountInput) (req *re // in the IAM User Guide. // // * ErrCodeAWSOrganizationsNotInUseException "AWSOrganizationsNotInUseException" -// Your account is not a member of an organization. To make this request, you +// Your account isn't a member of an organization. To make this request, you // must use the credentials of an account that belongs to an organization. // // * ErrCodeConcurrentModificationException "ConcurrentModificationException" @@ -857,40 +860,42 @@ func (c *Organizations) CreateAccountRequest(input *CreateAccountInput) (req *re // // * ErrCodeConstraintViolationException "ConstraintViolationException" // Performing this operation violates a minimum or maximum value limit. For -// example, attempting to removing the last SCP from an OU or root, inviting -// or creating too many accounts to the organization, or attaching too many -// policies to an account, OU, or root. This exception includes a reason that -// contains additional information about the violated limit: +// example, attempting to removing the last service control policy (SCP) from +// an OU or root, inviting or creating too many accounts to the organization, +// or attaching too many policies to an account, OU, or root. This exception +// includes a reason that contains additional information about the violated +// limit. // // Some of the reasons in the following list might not be applicable to this // specific API or operation: // -// ACCOUNT_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the limit on the number -// of accounts in an organization. If you need more accounts, contact AWS Support -// to request an increase in your limit. +// * ACCOUNT_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the limit on +// the number of accounts in an organization. If you need more accounts, +// contactAWS Support (https://console.aws.amazon.com/support/home#/) to +// request an increase in your limit. // -// Or, The number of invitations that you tried to send would cause you to exceed -// the limit of accounts in your organization. Send fewer invitations, or contact -// AWS Support to request an increase in the number of accounts. +// Or the number of invitations that you tried to send would cause you to exceed +// the limit of accounts in your organization. Send fewer invitations or +// contact AWS Support to request an increase in the number of accounts. // -// Note: deleted and closed accounts still count toward your limit. +// Deleted and closed accounts still count toward your limit. // // If you get receive this exception when running a command immediately after -// creating the organization, wait one hour and try again. If after an hour -// it continues to fail with this error, contact AWS Customer Support (https://console.aws.amazon.com/support/home#/). +// creating the organization, wait one hour and try again. If after an hour +// it continues to fail with this error, contact AWS Support (https://console.aws.amazon.com/support/home#/). // // * HANDSHAKE_RATE_LIMIT_EXCEEDED: You attempted to exceed the number of -// handshakes you can send in one day. +// handshakes that you can send in one day. // -// * OU_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the number of organizational -// units you can have in an organization. +// * OU_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the number of OUs +// that you can have in an organization. // -// * OU_DEPTH_LIMIT_EXCEEDED: You attempted to create an organizational unit -// tree that is too many levels deep. +// * OU_DEPTH_LIMIT_EXCEEDED: You attempted to create an OU tree that is +// too many levels deep. // // * ORGANIZATION_NOT_IN_ALL_FEATURES_MODE: You attempted to perform an operation // that requires the organization to be configured to support all features. -// An organization that supports consolidated billing features only cannot +// An organization that supports only consolidated billing features can't // perform this operation. // // * POLICY_NUMBER_LIMIT_EXCEEDED. You attempted to exceed the number of @@ -905,23 +910,24 @@ func (c *Organizations) CreateAccountRequest(input *CreateAccountInput) (req *re // minimum number of policies of a certain type required. // // * ACCOUNT_CANNOT_LEAVE_WITHOUT_EULA: You attempted to remove an account -// from the organization that does not yet have enough information to exist -// as a stand-alone account. This account requires you to first agree to -// the AWS Customer Agreement. Follow the steps at To leave an organization -// when all required account information has not yet been provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) +// from the organization that doesn't yet have enough information to exist +// as a standalone account. This account requires you to first agree to the +// AWS Customer Agreement. Follow the steps at To leave an organization when +// all required account information has not yet been provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) // in the AWS Organizations User Guide. // // * ACCOUNT_CANNOT_LEAVE_WITHOUT_PHONE_VERIFICATION: You attempted to remove -// an account from the organization that does not yet have enough information -// to exist as a stand-alone account. This account requires you to first -// complete phone verification. Follow the steps at To leave an organization -// when all required account information has not yet been provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) +// an account from the organization that doesn't yet have enough information +// to exist as a standalone account. This account requires you to first complete +// phone verification. Follow the steps at To leave an organization when +// all required account information has not yet been provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) // in the AWS Organizations User Guide. // // * MASTER_ACCOUNT_PAYMENT_INSTRUMENT_REQUIRED: To create an organization -// with this account, you first must associate a payment instrument, such -// as a credit card, with the account. Follow the steps at To leave an organization -// when all required account information has not yet been provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) +// with this master account, you first must associate a payment instrument, +// such as a credit card, with the account. Follow the steps at To leave +// an organization when all required account information has not yet been +// provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) // in the AWS Organizations User Guide. // // * MEMBER_ACCOUNT_PAYMENT_INSTRUMENT_REQUIRED: To complete this operation @@ -954,11 +960,11 @@ func (c *Organizations) CreateAccountRequest(input *CreateAccountInput) (req *re // specific API or operation: // // * IMMUTABLE_POLICY: You specified a policy that is managed by AWS and -// cannot be modified. +// can't be modified. // // * INPUT_REQUIRED: You must include a value for all required parameters. // -// * INVALID_ENUM: You specified a value that is not valid for that parameter. +// * INVALID_ENUM: You specified a value that isn't valid for that parameter. // // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. @@ -978,11 +984,11 @@ func (c *Organizations) CreateAccountRequest(input *CreateAccountInput) (req *re // * INVALID_PATTERN_TARGET_ID: You specified a policy target ID that doesn't // match the required pattern. // -// * INVALID_ROLE_NAME: You provided a role name that is not valid. A role -// name can’t begin with the reserved prefix 'AWSServiceRoleFor'. +// * INVALID_ROLE_NAME: You provided a role name that isn't valid. A role +// name can't begin with the reserved prefix AWSServiceRoleFor. // -// * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid ARN for the -// organization. +// * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid Amazon Resource +// Name (ARN) for the organization. // // * INVALID_SYNTAX_POLICY_ID: You specified an invalid policy ID. // @@ -1005,10 +1011,10 @@ func (c *Organizations) CreateAccountRequest(input *CreateAccountInput) (req *re // between entities in the same root. // // * ErrCodeFinalizingOrganizationException "FinalizingOrganizationException" -// AWS Organizations could not perform the operation because your organization -// has not finished initializing. This can take up to an hour. Try again later. -// If after one hour you continue to receive this error, contact AWS Customer -// Support (https://console.aws.amazon.com/support/home#/). +// AWS Organizations couldn't perform the operation because your organization +// hasn't finished initializing. This can take up to an hour. Try again later. +// If after one hour you continue to receive this error, contact AWS Support +// (https://console.aws.amazon.com/support/home#/). // // * ErrCodeServiceException "ServiceException" // AWS Organizations can't complete your request because of an internal service @@ -1124,40 +1130,42 @@ func (c *Organizations) CreateOrganizationRequest(input *CreateOrganizationInput // // * ErrCodeConstraintViolationException "ConstraintViolationException" // Performing this operation violates a minimum or maximum value limit. For -// example, attempting to removing the last SCP from an OU or root, inviting -// or creating too many accounts to the organization, or attaching too many -// policies to an account, OU, or root. This exception includes a reason that -// contains additional information about the violated limit: +// example, attempting to removing the last service control policy (SCP) from +// an OU or root, inviting or creating too many accounts to the organization, +// or attaching too many policies to an account, OU, or root. This exception +// includes a reason that contains additional information about the violated +// limit. // // Some of the reasons in the following list might not be applicable to this // specific API or operation: // -// ACCOUNT_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the limit on the number -// of accounts in an organization. If you need more accounts, contact AWS Support -// to request an increase in your limit. +// * ACCOUNT_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the limit on +// the number of accounts in an organization. If you need more accounts, +// contactAWS Support (https://console.aws.amazon.com/support/home#/) to +// request an increase in your limit. // -// Or, The number of invitations that you tried to send would cause you to exceed -// the limit of accounts in your organization. Send fewer invitations, or contact -// AWS Support to request an increase in the number of accounts. +// Or the number of invitations that you tried to send would cause you to exceed +// the limit of accounts in your organization. Send fewer invitations or +// contact AWS Support to request an increase in the number of accounts. // -// Note: deleted and closed accounts still count toward your limit. +// Deleted and closed accounts still count toward your limit. // // If you get receive this exception when running a command immediately after -// creating the organization, wait one hour and try again. If after an hour -// it continues to fail with this error, contact AWS Customer Support (https://console.aws.amazon.com/support/home#/). +// creating the organization, wait one hour and try again. If after an hour +// it continues to fail with this error, contact AWS Support (https://console.aws.amazon.com/support/home#/). // // * HANDSHAKE_RATE_LIMIT_EXCEEDED: You attempted to exceed the number of -// handshakes you can send in one day. +// handshakes that you can send in one day. // -// * OU_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the number of organizational -// units you can have in an organization. +// * OU_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the number of OUs +// that you can have in an organization. // -// * OU_DEPTH_LIMIT_EXCEEDED: You attempted to create an organizational unit -// tree that is too many levels deep. +// * OU_DEPTH_LIMIT_EXCEEDED: You attempted to create an OU tree that is +// too many levels deep. // // * ORGANIZATION_NOT_IN_ALL_FEATURES_MODE: You attempted to perform an operation // that requires the organization to be configured to support all features. -// An organization that supports consolidated billing features only cannot +// An organization that supports only consolidated billing features can't // perform this operation. // // * POLICY_NUMBER_LIMIT_EXCEEDED. You attempted to exceed the number of @@ -1172,23 +1180,24 @@ func (c *Organizations) CreateOrganizationRequest(input *CreateOrganizationInput // minimum number of policies of a certain type required. // // * ACCOUNT_CANNOT_LEAVE_WITHOUT_EULA: You attempted to remove an account -// from the organization that does not yet have enough information to exist -// as a stand-alone account. This account requires you to first agree to -// the AWS Customer Agreement. Follow the steps at To leave an organization -// when all required account information has not yet been provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) +// from the organization that doesn't yet have enough information to exist +// as a standalone account. This account requires you to first agree to the +// AWS Customer Agreement. Follow the steps at To leave an organization when +// all required account information has not yet been provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) // in the AWS Organizations User Guide. // // * ACCOUNT_CANNOT_LEAVE_WITHOUT_PHONE_VERIFICATION: You attempted to remove -// an account from the organization that does not yet have enough information -// to exist as a stand-alone account. This account requires you to first -// complete phone verification. Follow the steps at To leave an organization -// when all required account information has not yet been provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) +// an account from the organization that doesn't yet have enough information +// to exist as a standalone account. This account requires you to first complete +// phone verification. Follow the steps at To leave an organization when +// all required account information has not yet been provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) // in the AWS Organizations User Guide. // // * MASTER_ACCOUNT_PAYMENT_INSTRUMENT_REQUIRED: To create an organization -// with this account, you first must associate a payment instrument, such -// as a credit card, with the account. Follow the steps at To leave an organization -// when all required account information has not yet been provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) +// with this master account, you first must associate a payment instrument, +// such as a credit card, with the account. Follow the steps at To leave +// an organization when all required account information has not yet been +// provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) // in the AWS Organizations User Guide. // // * MEMBER_ACCOUNT_PAYMENT_INSTRUMENT_REQUIRED: To complete this operation @@ -1221,11 +1230,11 @@ func (c *Organizations) CreateOrganizationRequest(input *CreateOrganizationInput // specific API or operation: // // * IMMUTABLE_POLICY: You specified a policy that is managed by AWS and -// cannot be modified. +// can't be modified. // // * INPUT_REQUIRED: You must include a value for all required parameters. // -// * INVALID_ENUM: You specified a value that is not valid for that parameter. +// * INVALID_ENUM: You specified a value that isn't valid for that parameter. // // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. @@ -1245,11 +1254,11 @@ func (c *Organizations) CreateOrganizationRequest(input *CreateOrganizationInput // * INVALID_PATTERN_TARGET_ID: You specified a policy target ID that doesn't // match the required pattern. // -// * INVALID_ROLE_NAME: You provided a role name that is not valid. A role -// name can’t begin with the reserved prefix 'AWSServiceRoleFor'. +// * INVALID_ROLE_NAME: You provided a role name that isn't valid. A role +// name can't begin with the reserved prefix AWSServiceRoleFor. // -// * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid ARN for the -// organization. +// * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid Amazon Resource +// Name (ARN) for the organization. // // * INVALID_SYNTAX_POLICY_ID: You specified an invalid policy ID. // @@ -1280,9 +1289,9 @@ func (c *Organizations) CreateOrganizationRequest(input *CreateOrganizationInput // protect against denial-of-service attacks. Try again later. // // * ErrCodeAccessDeniedForDependencyException "AccessDeniedForDependencyException" -// The operation you attempted requires you to have the iam:CreateServiceLinkedRole -// so that Organizations can create the required service-linked role. You do -// not have that permission. +// The operation that you attempted requires you to have the iam:CreateServiceLinkedRole +// so that AWS Organizations can create the required service-linked role. You +// don't have that permission. // // See also, https://docs.aws.amazon.com/goto/WebAPI/organizations-2016-11-28/CreateOrganization func (c *Organizations) CreateOrganization(input *CreateOrganizationInput) (*CreateOrganizationOutput, error) { @@ -1377,7 +1386,7 @@ func (c *Organizations) CreateOrganizationalUnitRequest(input *CreateOrganizatio // in the IAM User Guide. // // * ErrCodeAWSOrganizationsNotInUseException "AWSOrganizationsNotInUseException" -// Your account is not a member of an organization. To make this request, you +// Your account isn't a member of an organization. To make this request, you // must use the credentials of an account that belongs to an organization. // // * ErrCodeConcurrentModificationException "ConcurrentModificationException" @@ -1386,40 +1395,42 @@ func (c *Organizations) CreateOrganizationalUnitRequest(input *CreateOrganizatio // // * ErrCodeConstraintViolationException "ConstraintViolationException" // Performing this operation violates a minimum or maximum value limit. For -// example, attempting to removing the last SCP from an OU or root, inviting -// or creating too many accounts to the organization, or attaching too many -// policies to an account, OU, or root. This exception includes a reason that -// contains additional information about the violated limit: +// example, attempting to removing the last service control policy (SCP) from +// an OU or root, inviting or creating too many accounts to the organization, +// or attaching too many policies to an account, OU, or root. This exception +// includes a reason that contains additional information about the violated +// limit. // // Some of the reasons in the following list might not be applicable to this // specific API or operation: // -// ACCOUNT_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the limit on the number -// of accounts in an organization. If you need more accounts, contact AWS Support -// to request an increase in your limit. +// * ACCOUNT_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the limit on +// the number of accounts in an organization. If you need more accounts, +// contactAWS Support (https://console.aws.amazon.com/support/home#/) to +// request an increase in your limit. // -// Or, The number of invitations that you tried to send would cause you to exceed -// the limit of accounts in your organization. Send fewer invitations, or contact -// AWS Support to request an increase in the number of accounts. +// Or the number of invitations that you tried to send would cause you to exceed +// the limit of accounts in your organization. Send fewer invitations or +// contact AWS Support to request an increase in the number of accounts. // -// Note: deleted and closed accounts still count toward your limit. +// Deleted and closed accounts still count toward your limit. // // If you get receive this exception when running a command immediately after -// creating the organization, wait one hour and try again. If after an hour -// it continues to fail with this error, contact AWS Customer Support (https://console.aws.amazon.com/support/home#/). +// creating the organization, wait one hour and try again. If after an hour +// it continues to fail with this error, contact AWS Support (https://console.aws.amazon.com/support/home#/). // // * HANDSHAKE_RATE_LIMIT_EXCEEDED: You attempted to exceed the number of -// handshakes you can send in one day. +// handshakes that you can send in one day. // -// * OU_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the number of organizational -// units you can have in an organization. +// * OU_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the number of OUs +// that you can have in an organization. // -// * OU_DEPTH_LIMIT_EXCEEDED: You attempted to create an organizational unit -// tree that is too many levels deep. +// * OU_DEPTH_LIMIT_EXCEEDED: You attempted to create an OU tree that is +// too many levels deep. // // * ORGANIZATION_NOT_IN_ALL_FEATURES_MODE: You attempted to perform an operation // that requires the organization to be configured to support all features. -// An organization that supports consolidated billing features only cannot +// An organization that supports only consolidated billing features can't // perform this operation. // // * POLICY_NUMBER_LIMIT_EXCEEDED. You attempted to exceed the number of @@ -1434,23 +1445,24 @@ func (c *Organizations) CreateOrganizationalUnitRequest(input *CreateOrganizatio // minimum number of policies of a certain type required. // // * ACCOUNT_CANNOT_LEAVE_WITHOUT_EULA: You attempted to remove an account -// from the organization that does not yet have enough information to exist -// as a stand-alone account. This account requires you to first agree to -// the AWS Customer Agreement. Follow the steps at To leave an organization -// when all required account information has not yet been provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) +// from the organization that doesn't yet have enough information to exist +// as a standalone account. This account requires you to first agree to the +// AWS Customer Agreement. Follow the steps at To leave an organization when +// all required account information has not yet been provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) // in the AWS Organizations User Guide. // // * ACCOUNT_CANNOT_LEAVE_WITHOUT_PHONE_VERIFICATION: You attempted to remove -// an account from the organization that does not yet have enough information -// to exist as a stand-alone account. This account requires you to first -// complete phone verification. Follow the steps at To leave an organization -// when all required account information has not yet been provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) +// an account from the organization that doesn't yet have enough information +// to exist as a standalone account. This account requires you to first complete +// phone verification. Follow the steps at To leave an organization when +// all required account information has not yet been provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) // in the AWS Organizations User Guide. // // * MASTER_ACCOUNT_PAYMENT_INSTRUMENT_REQUIRED: To create an organization -// with this account, you first must associate a payment instrument, such -// as a credit card, with the account. Follow the steps at To leave an organization -// when all required account information has not yet been provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) +// with this master account, you first must associate a payment instrument, +// such as a credit card, with the account. Follow the steps at To leave +// an organization when all required account information has not yet been +// provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) // in the AWS Organizations User Guide. // // * MEMBER_ACCOUNT_PAYMENT_INSTRUMENT_REQUIRED: To complete this operation @@ -1475,7 +1487,7 @@ func (c *Organizations) CreateOrganizationalUnitRequest(input *CreateOrganizatio // account. Then try the operation again. // // * ErrCodeDuplicateOrganizationalUnitException "DuplicateOrganizationalUnitException" -// An organizational unit (OU) with the same name already exists. +// An OU with the same name already exists. // // * ErrCodeInvalidInputException "InvalidInputException" // The requested operation failed because you provided invalid values for one @@ -1486,11 +1498,11 @@ func (c *Organizations) CreateOrganizationalUnitRequest(input *CreateOrganizatio // specific API or operation: // // * IMMUTABLE_POLICY: You specified a policy that is managed by AWS and -// cannot be modified. +// can't be modified. // // * INPUT_REQUIRED: You must include a value for all required parameters. // -// * INVALID_ENUM: You specified a value that is not valid for that parameter. +// * INVALID_ENUM: You specified a value that isn't valid for that parameter. // // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. @@ -1510,11 +1522,11 @@ func (c *Organizations) CreateOrganizationalUnitRequest(input *CreateOrganizatio // * INVALID_PATTERN_TARGET_ID: You specified a policy target ID that doesn't // match the required pattern. // -// * INVALID_ROLE_NAME: You provided a role name that is not valid. A role -// name can’t begin with the reserved prefix 'AWSServiceRoleFor'. +// * INVALID_ROLE_NAME: You provided a role name that isn't valid. A role +// name can't begin with the reserved prefix AWSServiceRoleFor. // -// * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid ARN for the -// organization. +// * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid Amazon Resource +// Name (ARN) for the organization. // // * INVALID_SYNTAX_POLICY_ID: You specified an invalid policy ID. // @@ -1537,8 +1549,7 @@ func (c *Organizations) CreateOrganizationalUnitRequest(input *CreateOrganizatio // between entities in the same root. // // * ErrCodeParentNotFoundException "ParentNotFoundException" -// We can't find a root or organizational unit (OU) with the ParentId that you -// specified. +// We can't find a root or OU with the ParentId that you specified. // // * ErrCodeServiceException "ServiceException" // AWS Organizations can't complete your request because of an internal service @@ -1638,7 +1649,7 @@ func (c *Organizations) CreatePolicyRequest(input *CreatePolicyInput) (req *requ // in the IAM User Guide. // // * ErrCodeAWSOrganizationsNotInUseException "AWSOrganizationsNotInUseException" -// Your account is not a member of an organization. To make this request, you +// Your account isn't a member of an organization. To make this request, you // must use the credentials of an account that belongs to an organization. // // * ErrCodeConcurrentModificationException "ConcurrentModificationException" @@ -1647,40 +1658,42 @@ func (c *Organizations) CreatePolicyRequest(input *CreatePolicyInput) (req *requ // // * ErrCodeConstraintViolationException "ConstraintViolationException" // Performing this operation violates a minimum or maximum value limit. For -// example, attempting to removing the last SCP from an OU or root, inviting -// or creating too many accounts to the organization, or attaching too many -// policies to an account, OU, or root. This exception includes a reason that -// contains additional information about the violated limit: +// example, attempting to removing the last service control policy (SCP) from +// an OU or root, inviting or creating too many accounts to the organization, +// or attaching too many policies to an account, OU, or root. This exception +// includes a reason that contains additional information about the violated +// limit. // // Some of the reasons in the following list might not be applicable to this // specific API or operation: // -// ACCOUNT_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the limit on the number -// of accounts in an organization. If you need more accounts, contact AWS Support -// to request an increase in your limit. +// * ACCOUNT_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the limit on +// the number of accounts in an organization. If you need more accounts, +// contactAWS Support (https://console.aws.amazon.com/support/home#/) to +// request an increase in your limit. // -// Or, The number of invitations that you tried to send would cause you to exceed -// the limit of accounts in your organization. Send fewer invitations, or contact -// AWS Support to request an increase in the number of accounts. +// Or the number of invitations that you tried to send would cause you to exceed +// the limit of accounts in your organization. Send fewer invitations or +// contact AWS Support to request an increase in the number of accounts. // -// Note: deleted and closed accounts still count toward your limit. +// Deleted and closed accounts still count toward your limit. // // If you get receive this exception when running a command immediately after -// creating the organization, wait one hour and try again. If after an hour -// it continues to fail with this error, contact AWS Customer Support (https://console.aws.amazon.com/support/home#/). +// creating the organization, wait one hour and try again. If after an hour +// it continues to fail with this error, contact AWS Support (https://console.aws.amazon.com/support/home#/). // // * HANDSHAKE_RATE_LIMIT_EXCEEDED: You attempted to exceed the number of -// handshakes you can send in one day. +// handshakes that you can send in one day. // -// * OU_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the number of organizational -// units you can have in an organization. +// * OU_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the number of OUs +// that you can have in an organization. // -// * OU_DEPTH_LIMIT_EXCEEDED: You attempted to create an organizational unit -// tree that is too many levels deep. +// * OU_DEPTH_LIMIT_EXCEEDED: You attempted to create an OU tree that is +// too many levels deep. // // * ORGANIZATION_NOT_IN_ALL_FEATURES_MODE: You attempted to perform an operation // that requires the organization to be configured to support all features. -// An organization that supports consolidated billing features only cannot +// An organization that supports only consolidated billing features can't // perform this operation. // // * POLICY_NUMBER_LIMIT_EXCEEDED. You attempted to exceed the number of @@ -1695,23 +1708,24 @@ func (c *Organizations) CreatePolicyRequest(input *CreatePolicyInput) (req *requ // minimum number of policies of a certain type required. // // * ACCOUNT_CANNOT_LEAVE_WITHOUT_EULA: You attempted to remove an account -// from the organization that does not yet have enough information to exist -// as a stand-alone account. This account requires you to first agree to -// the AWS Customer Agreement. Follow the steps at To leave an organization -// when all required account information has not yet been provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) +// from the organization that doesn't yet have enough information to exist +// as a standalone account. This account requires you to first agree to the +// AWS Customer Agreement. Follow the steps at To leave an organization when +// all required account information has not yet been provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) // in the AWS Organizations User Guide. // // * ACCOUNT_CANNOT_LEAVE_WITHOUT_PHONE_VERIFICATION: You attempted to remove -// an account from the organization that does not yet have enough information -// to exist as a stand-alone account. This account requires you to first -// complete phone verification. Follow the steps at To leave an organization -// when all required account information has not yet been provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) +// an account from the organization that doesn't yet have enough information +// to exist as a standalone account. This account requires you to first complete +// phone verification. Follow the steps at To leave an organization when +// all required account information has not yet been provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) // in the AWS Organizations User Guide. // // * MASTER_ACCOUNT_PAYMENT_INSTRUMENT_REQUIRED: To create an organization -// with this account, you first must associate a payment instrument, such -// as a credit card, with the account. Follow the steps at To leave an organization -// when all required account information has not yet been provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) +// with this master account, you first must associate a payment instrument, +// such as a credit card, with the account. Follow the steps at To leave +// an organization when all required account information has not yet been +// provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) // in the AWS Organizations User Guide. // // * MEMBER_ACCOUNT_PAYMENT_INSTRUMENT_REQUIRED: To complete this operation @@ -1747,11 +1761,11 @@ func (c *Organizations) CreatePolicyRequest(input *CreatePolicyInput) (req *requ // specific API or operation: // // * IMMUTABLE_POLICY: You specified a policy that is managed by AWS and -// cannot be modified. +// can't be modified. // // * INPUT_REQUIRED: You must include a value for all required parameters. // -// * INVALID_ENUM: You specified a value that is not valid for that parameter. +// * INVALID_ENUM: You specified a value that isn't valid for that parameter. // // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. @@ -1771,11 +1785,11 @@ func (c *Organizations) CreatePolicyRequest(input *CreatePolicyInput) (req *requ // * INVALID_PATTERN_TARGET_ID: You specified a policy target ID that doesn't // match the required pattern. // -// * INVALID_ROLE_NAME: You provided a role name that is not valid. A role -// name can’t begin with the reserved prefix 'AWSServiceRoleFor'. +// * INVALID_ROLE_NAME: You provided a role name that isn't valid. A role +// name can't begin with the reserved prefix AWSServiceRoleFor. // -// * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid ARN for the -// organization. +// * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid Amazon Resource +// Name (ARN) for the organization. // // * INVALID_SYNTAX_POLICY_ID: You specified an invalid policy ID. // @@ -1798,16 +1812,16 @@ func (c *Organizations) CreatePolicyRequest(input *CreatePolicyInput) (req *requ // between entities in the same root. // // * ErrCodeMalformedPolicyDocumentException "MalformedPolicyDocumentException" -// The provided policy document does not meet the requirements of the specified +// The provided policy document doesn't meet the requirements of the specified // policy type. For example, the syntax might be incorrect. For details about // service control policy syntax, see Service Control Policy Syntax (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_reference_scp-syntax.html) // in the AWS Organizations User Guide. // // * ErrCodePolicyTypeNotAvailableForOrganizationException "PolicyTypeNotAvailableForOrganizationException" // You can't use the specified policy type with the feature set currently enabled -// for this organization. For example, you can enable service control policies -// (SCPs) only after you enable all features in the organization. For more information, -// see Enabling and Disabling a Policy Type on a Root (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_policies.html#enable_policies_on_root) +// for this organization. For example, you can enable SCPs only after you enable +// all features in the organization. For more information, see Enabling and +// Disabling a Policy Type on a Root (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_policies.html#enable_policies_on_root) // in the AWS Organizations User Guide. // // * ErrCodeServiceException "ServiceException" @@ -1919,7 +1933,7 @@ func (c *Organizations) DeclineHandshakeRequest(input *DeclineHandshakeInput) (r // // * ErrCodeInvalidHandshakeTransitionException "InvalidHandshakeTransitionException" // You can't perform the operation on the handshake in its current state. For -// example, you can't cancel a handshake that was already accepted, or accept +// example, you can't cancel a handshake that was already accepted or accept // a handshake that was already declined. // // * ErrCodeHandshakeAlreadyInStateException "HandshakeAlreadyInStateException" @@ -1935,11 +1949,11 @@ func (c *Organizations) DeclineHandshakeRequest(input *DeclineHandshakeInput) (r // specific API or operation: // // * IMMUTABLE_POLICY: You specified a policy that is managed by AWS and -// cannot be modified. +// can't be modified. // // * INPUT_REQUIRED: You must include a value for all required parameters. // -// * INVALID_ENUM: You specified a value that is not valid for that parameter. +// * INVALID_ENUM: You specified a value that isn't valid for that parameter. // // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. @@ -1959,11 +1973,11 @@ func (c *Organizations) DeclineHandshakeRequest(input *DeclineHandshakeInput) (r // * INVALID_PATTERN_TARGET_ID: You specified a policy target ID that doesn't // match the required pattern. // -// * INVALID_ROLE_NAME: You provided a role name that is not valid. A role -// name can’t begin with the reserved prefix 'AWSServiceRoleFor'. +// * INVALID_ROLE_NAME: You provided a role name that isn't valid. A role +// name can't begin with the reserved prefix AWSServiceRoleFor. // -// * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid ARN for the -// organization. +// * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid Amazon Resource +// Name (ARN) for the organization. // // * INVALID_SYNTAX_POLICY_ID: You specified an invalid policy ID. // @@ -2062,8 +2076,7 @@ func (c *Organizations) DeleteOrganizationRequest(input *DeleteOrganizationInput // DeleteOrganization API operation for AWS Organizations. // // Deletes the organization. You can delete an organization only by using credentials -// from the master account. The organization must be empty of member accounts, -// organizational units (OUs), and policies. +// from the master account. The organization must be empty of member accounts. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about @@ -2081,7 +2094,7 @@ func (c *Organizations) DeleteOrganizationRequest(input *DeleteOrganizationInput // in the IAM User Guide. // // * ErrCodeAWSOrganizationsNotInUseException "AWSOrganizationsNotInUseException" -// Your account is not a member of an organization. To make this request, you +// Your account isn't a member of an organization. To make this request, you // must use the credentials of an account that belongs to an organization. // // * ErrCodeConcurrentModificationException "ConcurrentModificationException" @@ -2097,11 +2110,11 @@ func (c *Organizations) DeleteOrganizationRequest(input *DeleteOrganizationInput // specific API or operation: // // * IMMUTABLE_POLICY: You specified a policy that is managed by AWS and -// cannot be modified. +// can't be modified. // // * INPUT_REQUIRED: You must include a value for all required parameters. // -// * INVALID_ENUM: You specified a value that is not valid for that parameter. +// * INVALID_ENUM: You specified a value that isn't valid for that parameter. // // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. @@ -2121,11 +2134,11 @@ func (c *Organizations) DeleteOrganizationRequest(input *DeleteOrganizationInput // * INVALID_PATTERN_TARGET_ID: You specified a policy target ID that doesn't // match the required pattern. // -// * INVALID_ROLE_NAME: You provided a role name that is not valid. A role -// name can’t begin with the reserved prefix 'AWSServiceRoleFor'. +// * INVALID_ROLE_NAME: You provided a role name that isn't valid. A role +// name can't begin with the reserved prefix AWSServiceRoleFor. // -// * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid ARN for the -// organization. +// * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid Amazon Resource +// Name (ARN) for the organization. // // * INVALID_SYNTAX_POLICY_ID: You specified an invalid policy ID. // @@ -2149,8 +2162,7 @@ func (c *Organizations) DeleteOrganizationRequest(input *DeleteOrganizationInput // // * ErrCodeOrganizationNotEmptyException "OrganizationNotEmptyException" // The organization isn't empty. To delete an organization, you must first remove -// all accounts except the master account, delete all organizational units (OUs), -// and delete all policies. +// all accounts except the master account, delete all OUs, and delete all policies. // // * ErrCodeServiceException "ServiceException" // AWS Organizations can't complete your request because of an internal service @@ -2249,7 +2261,7 @@ func (c *Organizations) DeleteOrganizationalUnitRequest(input *DeleteOrganizatio // in the IAM User Guide. // // * ErrCodeAWSOrganizationsNotInUseException "AWSOrganizationsNotInUseException" -// Your account is not a member of an organization. To make this request, you +// Your account isn't a member of an organization. To make this request, you // must use the credentials of an account that belongs to an organization. // // * ErrCodeConcurrentModificationException "ConcurrentModificationException" @@ -2265,11 +2277,11 @@ func (c *Organizations) DeleteOrganizationalUnitRequest(input *DeleteOrganizatio // specific API or operation: // // * IMMUTABLE_POLICY: You specified a policy that is managed by AWS and -// cannot be modified. +// can't be modified. // // * INPUT_REQUIRED: You must include a value for all required parameters. // -// * INVALID_ENUM: You specified a value that is not valid for that parameter. +// * INVALID_ENUM: You specified a value that isn't valid for that parameter. // // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. @@ -2289,11 +2301,11 @@ func (c *Organizations) DeleteOrganizationalUnitRequest(input *DeleteOrganizatio // * INVALID_PATTERN_TARGET_ID: You specified a policy target ID that doesn't // match the required pattern. // -// * INVALID_ROLE_NAME: You provided a role name that is not valid. A role -// name can’t begin with the reserved prefix 'AWSServiceRoleFor'. +// * INVALID_ROLE_NAME: You provided a role name that isn't valid. A role +// name can't begin with the reserved prefix AWSServiceRoleFor. // -// * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid ARN for the -// organization. +// * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid Amazon Resource +// Name (ARN) for the organization. // // * INVALID_SYNTAX_POLICY_ID: You specified an invalid policy ID. // @@ -2316,13 +2328,11 @@ func (c *Organizations) DeleteOrganizationalUnitRequest(input *DeleteOrganizatio // between entities in the same root. // // * ErrCodeOrganizationalUnitNotEmptyException "OrganizationalUnitNotEmptyException" -// The specified organizational unit (OU) is not empty. Move all accounts to -// another root or to other OUs, remove all child OUs, and then try the operation -// again. +// The specified OU is not empty. Move all accounts to another root or to other +// OUs, remove all child OUs, and try the operation again. // // * ErrCodeOrganizationalUnitNotFoundException "OrganizationalUnitNotFoundException" -// We can't find an organizational unit (OU) with the OrganizationalUnitId that -// you specified. +// We can't find an OU with the OrganizationalUnitId that you specified. // // * ErrCodeServiceException "ServiceException" // AWS Organizations can't complete your request because of an internal service @@ -2422,7 +2432,7 @@ func (c *Organizations) DeletePolicyRequest(input *DeletePolicyInput) (req *requ // in the IAM User Guide. // // * ErrCodeAWSOrganizationsNotInUseException "AWSOrganizationsNotInUseException" -// Your account is not a member of an organization. To make this request, you +// Your account isn't a member of an organization. To make this request, you // must use the credentials of an account that belongs to an organization. // // * ErrCodeConcurrentModificationException "ConcurrentModificationException" @@ -2438,11 +2448,11 @@ func (c *Organizations) DeletePolicyRequest(input *DeletePolicyInput) (req *requ // specific API or operation: // // * IMMUTABLE_POLICY: You specified a policy that is managed by AWS and -// cannot be modified. +// can't be modified. // // * INPUT_REQUIRED: You must include a value for all required parameters. // -// * INVALID_ENUM: You specified a value that is not valid for that parameter. +// * INVALID_ENUM: You specified a value that isn't valid for that parameter. // // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. @@ -2462,11 +2472,11 @@ func (c *Organizations) DeletePolicyRequest(input *DeletePolicyInput) (req *requ // * INVALID_PATTERN_TARGET_ID: You specified a policy target ID that doesn't // match the required pattern. // -// * INVALID_ROLE_NAME: You provided a role name that is not valid. A role -// name can’t begin with the reserved prefix 'AWSServiceRoleFor'. +// * INVALID_ROLE_NAME: You provided a role name that isn't valid. A role +// name can't begin with the reserved prefix AWSServiceRoleFor. // -// * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid ARN for the -// organization. +// * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid Amazon Resource +// Name (ARN) for the organization. // // * INVALID_SYNTAX_POLICY_ID: You specified an invalid policy ID. // @@ -2490,7 +2500,7 @@ func (c *Organizations) DeletePolicyRequest(input *DeletePolicyInput) (req *requ // // * ErrCodePolicyInUseException "PolicyInUseException" // The policy is attached to one or more entities. You must detach it from all -// roots, organizational units (OUs), and accounts before performing this operation. +// roots, OUs, and accounts before performing this operation. // // * ErrCodePolicyNotFoundException "PolicyNotFoundException" // We can't find a policy with the PolicyId that you specified. @@ -2590,11 +2600,11 @@ func (c *Organizations) DescribeAccountRequest(input *DescribeAccountInput) (req // // * ErrCodeAccountNotFoundException "AccountNotFoundException" // We can't find an AWS account with the AccountId that you specified, or the -// account whose credentials you used to make this request is not a member of +// account whose credentials you used to make this request isn't a member of // an organization. // // * ErrCodeAWSOrganizationsNotInUseException "AWSOrganizationsNotInUseException" -// Your account is not a member of an organization. To make this request, you +// Your account isn't a member of an organization. To make this request, you // must use the credentials of an account that belongs to an organization. // // * ErrCodeInvalidInputException "InvalidInputException" @@ -2606,11 +2616,11 @@ func (c *Organizations) DescribeAccountRequest(input *DescribeAccountInput) (req // specific API or operation: // // * IMMUTABLE_POLICY: You specified a policy that is managed by AWS and -// cannot be modified. +// can't be modified. // // * INPUT_REQUIRED: You must include a value for all required parameters. // -// * INVALID_ENUM: You specified a value that is not valid for that parameter. +// * INVALID_ENUM: You specified a value that isn't valid for that parameter. // // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. @@ -2630,11 +2640,11 @@ func (c *Organizations) DescribeAccountRequest(input *DescribeAccountInput) (req // * INVALID_PATTERN_TARGET_ID: You specified a policy target ID that doesn't // match the required pattern. // -// * INVALID_ROLE_NAME: You provided a role name that is not valid. A role -// name can’t begin with the reserved prefix 'AWSServiceRoleFor'. +// * INVALID_ROLE_NAME: You provided a role name that isn't valid. A role +// name can't begin with the reserved prefix AWSServiceRoleFor. // -// * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid ARN for the -// organization. +// * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid Amazon Resource +// Name (ARN) for the organization. // // * INVALID_SYNTAX_POLICY_ID: You specified an invalid policy ID. // @@ -2750,7 +2760,7 @@ func (c *Organizations) DescribeCreateAccountStatusRequest(input *DescribeCreate // in the IAM User Guide. // // * ErrCodeAWSOrganizationsNotInUseException "AWSOrganizationsNotInUseException" -// Your account is not a member of an organization. To make this request, you +// Your account isn't a member of an organization. To make this request, you // must use the credentials of an account that belongs to an organization. // // * ErrCodeCreateAccountStatusNotFoundException "CreateAccountStatusNotFoundException" @@ -2766,11 +2776,11 @@ func (c *Organizations) DescribeCreateAccountStatusRequest(input *DescribeCreate // specific API or operation: // // * IMMUTABLE_POLICY: You specified a policy that is managed by AWS and -// cannot be modified. +// can't be modified. // // * INPUT_REQUIRED: You must include a value for all required parameters. // -// * INVALID_ENUM: You specified a value that is not valid for that parameter. +// * INVALID_ENUM: You specified a value that isn't valid for that parameter. // // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. @@ -2790,11 +2800,11 @@ func (c *Organizations) DescribeCreateAccountStatusRequest(input *DescribeCreate // * INVALID_PATTERN_TARGET_ID: You specified a policy target ID that doesn't // match the required pattern. // -// * INVALID_ROLE_NAME: You provided a role name that is not valid. A role -// name can’t begin with the reserved prefix 'AWSServiceRoleFor'. +// * INVALID_ROLE_NAME: You provided a role name that isn't valid. A role +// name can't begin with the reserved prefix AWSServiceRoleFor. // -// * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid ARN for the -// organization. +// * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid Amazon Resource +// Name (ARN) for the organization. // // * INVALID_SYNTAX_POLICY_ID: You specified an invalid policy ID. // @@ -2931,11 +2941,11 @@ func (c *Organizations) DescribeHandshakeRequest(input *DescribeHandshakeInput) // specific API or operation: // // * IMMUTABLE_POLICY: You specified a policy that is managed by AWS and -// cannot be modified. +// can't be modified. // // * INPUT_REQUIRED: You must include a value for all required parameters. // -// * INVALID_ENUM: You specified a value that is not valid for that parameter. +// * INVALID_ENUM: You specified a value that isn't valid for that parameter. // // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. @@ -2955,11 +2965,11 @@ func (c *Organizations) DescribeHandshakeRequest(input *DescribeHandshakeInput) // * INVALID_PATTERN_TARGET_ID: You specified a policy target ID that doesn't // match the required pattern. // -// * INVALID_ROLE_NAME: You provided a role name that is not valid. A role -// name can’t begin with the reserved prefix 'AWSServiceRoleFor'. +// * INVALID_ROLE_NAME: You provided a role name that isn't valid. A role +// name can't begin with the reserved prefix AWSServiceRoleFor. // -// * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid ARN for the -// organization. +// * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid Amazon Resource +// Name (ARN) for the organization. // // * INVALID_SYNTAX_POLICY_ID: You specified an invalid policy ID. // @@ -3080,7 +3090,7 @@ func (c *Organizations) DescribeOrganizationRequest(input *DescribeOrganizationI // in the IAM User Guide. // // * ErrCodeAWSOrganizationsNotInUseException "AWSOrganizationsNotInUseException" -// Your account is not a member of an organization. To make this request, you +// Your account isn't a member of an organization. To make this request, you // must use the credentials of an account that belongs to an organization. // // * ErrCodeConcurrentModificationException "ConcurrentModificationException" @@ -3181,7 +3191,7 @@ func (c *Organizations) DescribeOrganizationalUnitRequest(input *DescribeOrganiz // in the IAM User Guide. // // * ErrCodeAWSOrganizationsNotInUseException "AWSOrganizationsNotInUseException" -// Your account is not a member of an organization. To make this request, you +// Your account isn't a member of an organization. To make this request, you // must use the credentials of an account that belongs to an organization. // // * ErrCodeInvalidInputException "InvalidInputException" @@ -3193,11 +3203,11 @@ func (c *Organizations) DescribeOrganizationalUnitRequest(input *DescribeOrganiz // specific API or operation: // // * IMMUTABLE_POLICY: You specified a policy that is managed by AWS and -// cannot be modified. +// can't be modified. // // * INPUT_REQUIRED: You must include a value for all required parameters. // -// * INVALID_ENUM: You specified a value that is not valid for that parameter. +// * INVALID_ENUM: You specified a value that isn't valid for that parameter. // // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. @@ -3217,11 +3227,11 @@ func (c *Organizations) DescribeOrganizationalUnitRequest(input *DescribeOrganiz // * INVALID_PATTERN_TARGET_ID: You specified a policy target ID that doesn't // match the required pattern. // -// * INVALID_ROLE_NAME: You provided a role name that is not valid. A role -// name can’t begin with the reserved prefix 'AWSServiceRoleFor'. +// * INVALID_ROLE_NAME: You provided a role name that isn't valid. A role +// name can't begin with the reserved prefix AWSServiceRoleFor. // -// * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid ARN for the -// organization. +// * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid Amazon Resource +// Name (ARN) for the organization. // // * INVALID_SYNTAX_POLICY_ID: You specified an invalid policy ID. // @@ -3244,8 +3254,7 @@ func (c *Organizations) DescribeOrganizationalUnitRequest(input *DescribeOrganiz // between entities in the same root. // // * ErrCodeOrganizationalUnitNotFoundException "OrganizationalUnitNotFoundException" -// We can't find an organizational unit (OU) with the OrganizationalUnitId that -// you specified. +// We can't find an OU with the OrganizationalUnitId that you specified. // // * ErrCodeServiceException "ServiceException" // AWS Organizations can't complete your request because of an internal service @@ -3341,7 +3350,7 @@ func (c *Organizations) DescribePolicyRequest(input *DescribePolicyInput) (req * // in the IAM User Guide. // // * ErrCodeAWSOrganizationsNotInUseException "AWSOrganizationsNotInUseException" -// Your account is not a member of an organization. To make this request, you +// Your account isn't a member of an organization. To make this request, you // must use the credentials of an account that belongs to an organization. // // * ErrCodeInvalidInputException "InvalidInputException" @@ -3353,11 +3362,11 @@ func (c *Organizations) DescribePolicyRequest(input *DescribePolicyInput) (req * // specific API or operation: // // * IMMUTABLE_POLICY: You specified a policy that is managed by AWS and -// cannot be modified. +// can't be modified. // // * INPUT_REQUIRED: You must include a value for all required parameters. // -// * INVALID_ENUM: You specified a value that is not valid for that parameter. +// * INVALID_ENUM: You specified a value that isn't valid for that parameter. // // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. @@ -3377,11 +3386,11 @@ func (c *Organizations) DescribePolicyRequest(input *DescribePolicyInput) (req * // * INVALID_PATTERN_TARGET_ID: You specified a policy target ID that doesn't // match the required pattern. // -// * INVALID_ROLE_NAME: You provided a role name that is not valid. A role -// name can’t begin with the reserved prefix 'AWSServiceRoleFor'. +// * INVALID_ROLE_NAME: You provided a role name that isn't valid. A role +// name can't begin with the reserved prefix AWSServiceRoleFor. // -// * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid ARN for the -// organization. +// * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid Amazon Resource +// Name (ARN) for the organization. // // * INVALID_SYNTAX_POLICY_ID: You specified an invalid policy ID. // @@ -3514,7 +3523,7 @@ func (c *Organizations) DetachPolicyRequest(input *DetachPolicyInput) (req *requ // in the IAM User Guide. // // * ErrCodeAWSOrganizationsNotInUseException "AWSOrganizationsNotInUseException" -// Your account is not a member of an organization. To make this request, you +// Your account isn't a member of an organization. To make this request, you // must use the credentials of an account that belongs to an organization. // // * ErrCodeConcurrentModificationException "ConcurrentModificationException" @@ -3523,40 +3532,42 @@ func (c *Organizations) DetachPolicyRequest(input *DetachPolicyInput) (req *requ // // * ErrCodeConstraintViolationException "ConstraintViolationException" // Performing this operation violates a minimum or maximum value limit. For -// example, attempting to removing the last SCP from an OU or root, inviting -// or creating too many accounts to the organization, or attaching too many -// policies to an account, OU, or root. This exception includes a reason that -// contains additional information about the violated limit: +// example, attempting to removing the last service control policy (SCP) from +// an OU or root, inviting or creating too many accounts to the organization, +// or attaching too many policies to an account, OU, or root. This exception +// includes a reason that contains additional information about the violated +// limit. // // Some of the reasons in the following list might not be applicable to this // specific API or operation: // -// ACCOUNT_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the limit on the number -// of accounts in an organization. If you need more accounts, contact AWS Support -// to request an increase in your limit. +// * ACCOUNT_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the limit on +// the number of accounts in an organization. If you need more accounts, +// contactAWS Support (https://console.aws.amazon.com/support/home#/) to +// request an increase in your limit. // -// Or, The number of invitations that you tried to send would cause you to exceed -// the limit of accounts in your organization. Send fewer invitations, or contact -// AWS Support to request an increase in the number of accounts. +// Or the number of invitations that you tried to send would cause you to exceed +// the limit of accounts in your organization. Send fewer invitations or +// contact AWS Support to request an increase in the number of accounts. // -// Note: deleted and closed accounts still count toward your limit. +// Deleted and closed accounts still count toward your limit. // // If you get receive this exception when running a command immediately after -// creating the organization, wait one hour and try again. If after an hour -// it continues to fail with this error, contact AWS Customer Support (https://console.aws.amazon.com/support/home#/). +// creating the organization, wait one hour and try again. If after an hour +// it continues to fail with this error, contact AWS Support (https://console.aws.amazon.com/support/home#/). // // * HANDSHAKE_RATE_LIMIT_EXCEEDED: You attempted to exceed the number of -// handshakes you can send in one day. +// handshakes that you can send in one day. // -// * OU_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the number of organizational -// units you can have in an organization. +// * OU_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the number of OUs +// that you can have in an organization. // -// * OU_DEPTH_LIMIT_EXCEEDED: You attempted to create an organizational unit -// tree that is too many levels deep. +// * OU_DEPTH_LIMIT_EXCEEDED: You attempted to create an OU tree that is +// too many levels deep. // // * ORGANIZATION_NOT_IN_ALL_FEATURES_MODE: You attempted to perform an operation // that requires the organization to be configured to support all features. -// An organization that supports consolidated billing features only cannot +// An organization that supports only consolidated billing features can't // perform this operation. // // * POLICY_NUMBER_LIMIT_EXCEEDED. You attempted to exceed the number of @@ -3571,23 +3582,24 @@ func (c *Organizations) DetachPolicyRequest(input *DetachPolicyInput) (req *requ // minimum number of policies of a certain type required. // // * ACCOUNT_CANNOT_LEAVE_WITHOUT_EULA: You attempted to remove an account -// from the organization that does not yet have enough information to exist -// as a stand-alone account. This account requires you to first agree to -// the AWS Customer Agreement. Follow the steps at To leave an organization -// when all required account information has not yet been provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) +// from the organization that doesn't yet have enough information to exist +// as a standalone account. This account requires you to first agree to the +// AWS Customer Agreement. Follow the steps at To leave an organization when +// all required account information has not yet been provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) // in the AWS Organizations User Guide. // // * ACCOUNT_CANNOT_LEAVE_WITHOUT_PHONE_VERIFICATION: You attempted to remove -// an account from the organization that does not yet have enough information -// to exist as a stand-alone account. This account requires you to first -// complete phone verification. Follow the steps at To leave an organization -// when all required account information has not yet been provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) +// an account from the organization that doesn't yet have enough information +// to exist as a standalone account. This account requires you to first complete +// phone verification. Follow the steps at To leave an organization when +// all required account information has not yet been provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) // in the AWS Organizations User Guide. // // * MASTER_ACCOUNT_PAYMENT_INSTRUMENT_REQUIRED: To create an organization -// with this account, you first must associate a payment instrument, such -// as a credit card, with the account. Follow the steps at To leave an organization -// when all required account information has not yet been provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) +// with this master account, you first must associate a payment instrument, +// such as a credit card, with the account. Follow the steps at To leave +// an organization when all required account information has not yet been +// provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) // in the AWS Organizations User Guide. // // * MEMBER_ACCOUNT_PAYMENT_INSTRUMENT_REQUIRED: To complete this operation @@ -3620,11 +3632,11 @@ func (c *Organizations) DetachPolicyRequest(input *DetachPolicyInput) (req *requ // specific API or operation: // // * IMMUTABLE_POLICY: You specified a policy that is managed by AWS and -// cannot be modified. +// can't be modified. // // * INPUT_REQUIRED: You must include a value for all required parameters. // -// * INVALID_ENUM: You specified a value that is not valid for that parameter. +// * INVALID_ENUM: You specified a value that isn't valid for that parameter. // // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. @@ -3644,11 +3656,11 @@ func (c *Organizations) DetachPolicyRequest(input *DetachPolicyInput) (req *requ // * INVALID_PATTERN_TARGET_ID: You specified a policy target ID that doesn't // match the required pattern. // -// * INVALID_ROLE_NAME: You provided a role name that is not valid. A role -// name can’t begin with the reserved prefix 'AWSServiceRoleFor'. +// * INVALID_ROLE_NAME: You provided a role name that isn't valid. A role +// name can't begin with the reserved prefix AWSServiceRoleFor. // -// * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid ARN for the -// organization. +// * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid Amazon Resource +// Name (ARN) for the organization. // // * INVALID_SYNTAX_POLICY_ID: You specified an invalid policy ID. // @@ -3795,7 +3807,7 @@ func (c *Organizations) DisableAWSServiceAccessRequest(input *DisableAWSServiceA // in the IAM User Guide. // // * ErrCodeAWSOrganizationsNotInUseException "AWSOrganizationsNotInUseException" -// Your account is not a member of an organization. To make this request, you +// Your account isn't a member of an organization. To make this request, you // must use the credentials of an account that belongs to an organization. // // * ErrCodeConcurrentModificationException "ConcurrentModificationException" @@ -3804,40 +3816,42 @@ func (c *Organizations) DisableAWSServiceAccessRequest(input *DisableAWSServiceA // // * ErrCodeConstraintViolationException "ConstraintViolationException" // Performing this operation violates a minimum or maximum value limit. For -// example, attempting to removing the last SCP from an OU or root, inviting -// or creating too many accounts to the organization, or attaching too many -// policies to an account, OU, or root. This exception includes a reason that -// contains additional information about the violated limit: +// example, attempting to removing the last service control policy (SCP) from +// an OU or root, inviting or creating too many accounts to the organization, +// or attaching too many policies to an account, OU, or root. This exception +// includes a reason that contains additional information about the violated +// limit. // // Some of the reasons in the following list might not be applicable to this // specific API or operation: // -// ACCOUNT_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the limit on the number -// of accounts in an organization. If you need more accounts, contact AWS Support -// to request an increase in your limit. +// * ACCOUNT_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the limit on +// the number of accounts in an organization. If you need more accounts, +// contactAWS Support (https://console.aws.amazon.com/support/home#/) to +// request an increase in your limit. // -// Or, The number of invitations that you tried to send would cause you to exceed -// the limit of accounts in your organization. Send fewer invitations, or contact -// AWS Support to request an increase in the number of accounts. +// Or the number of invitations that you tried to send would cause you to exceed +// the limit of accounts in your organization. Send fewer invitations or +// contact AWS Support to request an increase in the number of accounts. // -// Note: deleted and closed accounts still count toward your limit. +// Deleted and closed accounts still count toward your limit. // // If you get receive this exception when running a command immediately after -// creating the organization, wait one hour and try again. If after an hour -// it continues to fail with this error, contact AWS Customer Support (https://console.aws.amazon.com/support/home#/). +// creating the organization, wait one hour and try again. If after an hour +// it continues to fail with this error, contact AWS Support (https://console.aws.amazon.com/support/home#/). // // * HANDSHAKE_RATE_LIMIT_EXCEEDED: You attempted to exceed the number of -// handshakes you can send in one day. +// handshakes that you can send in one day. // -// * OU_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the number of organizational -// units you can have in an organization. +// * OU_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the number of OUs +// that you can have in an organization. // -// * OU_DEPTH_LIMIT_EXCEEDED: You attempted to create an organizational unit -// tree that is too many levels deep. +// * OU_DEPTH_LIMIT_EXCEEDED: You attempted to create an OU tree that is +// too many levels deep. // // * ORGANIZATION_NOT_IN_ALL_FEATURES_MODE: You attempted to perform an operation // that requires the organization to be configured to support all features. -// An organization that supports consolidated billing features only cannot +// An organization that supports only consolidated billing features can't // perform this operation. // // * POLICY_NUMBER_LIMIT_EXCEEDED. You attempted to exceed the number of @@ -3852,23 +3866,24 @@ func (c *Organizations) DisableAWSServiceAccessRequest(input *DisableAWSServiceA // minimum number of policies of a certain type required. // // * ACCOUNT_CANNOT_LEAVE_WITHOUT_EULA: You attempted to remove an account -// from the organization that does not yet have enough information to exist -// as a stand-alone account. This account requires you to first agree to -// the AWS Customer Agreement. Follow the steps at To leave an organization -// when all required account information has not yet been provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) +// from the organization that doesn't yet have enough information to exist +// as a standalone account. This account requires you to first agree to the +// AWS Customer Agreement. Follow the steps at To leave an organization when +// all required account information has not yet been provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) // in the AWS Organizations User Guide. // // * ACCOUNT_CANNOT_LEAVE_WITHOUT_PHONE_VERIFICATION: You attempted to remove -// an account from the organization that does not yet have enough information -// to exist as a stand-alone account. This account requires you to first -// complete phone verification. Follow the steps at To leave an organization -// when all required account information has not yet been provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) +// an account from the organization that doesn't yet have enough information +// to exist as a standalone account. This account requires you to first complete +// phone verification. Follow the steps at To leave an organization when +// all required account information has not yet been provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) // in the AWS Organizations User Guide. // // * MASTER_ACCOUNT_PAYMENT_INSTRUMENT_REQUIRED: To create an organization -// with this account, you first must associate a payment instrument, such -// as a credit card, with the account. Follow the steps at To leave an organization -// when all required account information has not yet been provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) +// with this master account, you first must associate a payment instrument, +// such as a credit card, with the account. Follow the steps at To leave +// an organization when all required account information has not yet been +// provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) // in the AWS Organizations User Guide. // // * MEMBER_ACCOUNT_PAYMENT_INSTRUMENT_REQUIRED: To complete this operation @@ -3901,11 +3916,11 @@ func (c *Organizations) DisableAWSServiceAccessRequest(input *DisableAWSServiceA // specific API or operation: // // * IMMUTABLE_POLICY: You specified a policy that is managed by AWS and -// cannot be modified. +// can't be modified. // // * INPUT_REQUIRED: You must include a value for all required parameters. // -// * INVALID_ENUM: You specified a value that is not valid for that parameter. +// * INVALID_ENUM: You specified a value that isn't valid for that parameter. // // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. @@ -3925,11 +3940,11 @@ func (c *Organizations) DisableAWSServiceAccessRequest(input *DisableAWSServiceA // * INVALID_PATTERN_TARGET_ID: You specified a policy target ID that doesn't // match the required pattern. // -// * INVALID_ROLE_NAME: You provided a role name that is not valid. A role -// name can’t begin with the reserved prefix 'AWSServiceRoleFor'. +// * INVALID_ROLE_NAME: You provided a role name that isn't valid. A role +// name can't begin with the reserved prefix AWSServiceRoleFor. // -// * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid ARN for the -// organization. +// * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid Amazon Resource +// Name (ARN) for the organization. // // * INVALID_SYNTAX_POLICY_ID: You specified an invalid policy ID. // @@ -4054,7 +4069,7 @@ func (c *Organizations) DisablePolicyTypeRequest(input *DisablePolicyTypeInput) // in the IAM User Guide. // // * ErrCodeAWSOrganizationsNotInUseException "AWSOrganizationsNotInUseException" -// Your account is not a member of an organization. To make this request, you +// Your account isn't a member of an organization. To make this request, you // must use the credentials of an account that belongs to an organization. // // * ErrCodeConcurrentModificationException "ConcurrentModificationException" @@ -4063,40 +4078,42 @@ func (c *Organizations) DisablePolicyTypeRequest(input *DisablePolicyTypeInput) // // * ErrCodeConstraintViolationException "ConstraintViolationException" // Performing this operation violates a minimum or maximum value limit. For -// example, attempting to removing the last SCP from an OU or root, inviting -// or creating too many accounts to the organization, or attaching too many -// policies to an account, OU, or root. This exception includes a reason that -// contains additional information about the violated limit: +// example, attempting to removing the last service control policy (SCP) from +// an OU or root, inviting or creating too many accounts to the organization, +// or attaching too many policies to an account, OU, or root. This exception +// includes a reason that contains additional information about the violated +// limit. // // Some of the reasons in the following list might not be applicable to this // specific API or operation: // -// ACCOUNT_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the limit on the number -// of accounts in an organization. If you need more accounts, contact AWS Support -// to request an increase in your limit. +// * ACCOUNT_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the limit on +// the number of accounts in an organization. If you need more accounts, +// contactAWS Support (https://console.aws.amazon.com/support/home#/) to +// request an increase in your limit. // -// Or, The number of invitations that you tried to send would cause you to exceed -// the limit of accounts in your organization. Send fewer invitations, or contact -// AWS Support to request an increase in the number of accounts. +// Or the number of invitations that you tried to send would cause you to exceed +// the limit of accounts in your organization. Send fewer invitations or +// contact AWS Support to request an increase in the number of accounts. // -// Note: deleted and closed accounts still count toward your limit. +// Deleted and closed accounts still count toward your limit. // // If you get receive this exception when running a command immediately after -// creating the organization, wait one hour and try again. If after an hour -// it continues to fail with this error, contact AWS Customer Support (https://console.aws.amazon.com/support/home#/). +// creating the organization, wait one hour and try again. If after an hour +// it continues to fail with this error, contact AWS Support (https://console.aws.amazon.com/support/home#/). // // * HANDSHAKE_RATE_LIMIT_EXCEEDED: You attempted to exceed the number of -// handshakes you can send in one day. +// handshakes that you can send in one day. // -// * OU_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the number of organizational -// units you can have in an organization. +// * OU_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the number of OUs +// that you can have in an organization. // -// * OU_DEPTH_LIMIT_EXCEEDED: You attempted to create an organizational unit -// tree that is too many levels deep. +// * OU_DEPTH_LIMIT_EXCEEDED: You attempted to create an OU tree that is +// too many levels deep. // // * ORGANIZATION_NOT_IN_ALL_FEATURES_MODE: You attempted to perform an operation // that requires the organization to be configured to support all features. -// An organization that supports consolidated billing features only cannot +// An organization that supports only consolidated billing features can't // perform this operation. // // * POLICY_NUMBER_LIMIT_EXCEEDED. You attempted to exceed the number of @@ -4111,23 +4128,24 @@ func (c *Organizations) DisablePolicyTypeRequest(input *DisablePolicyTypeInput) // minimum number of policies of a certain type required. // // * ACCOUNT_CANNOT_LEAVE_WITHOUT_EULA: You attempted to remove an account -// from the organization that does not yet have enough information to exist -// as a stand-alone account. This account requires you to first agree to -// the AWS Customer Agreement. Follow the steps at To leave an organization -// when all required account information has not yet been provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) +// from the organization that doesn't yet have enough information to exist +// as a standalone account. This account requires you to first agree to the +// AWS Customer Agreement. Follow the steps at To leave an organization when +// all required account information has not yet been provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) // in the AWS Organizations User Guide. // // * ACCOUNT_CANNOT_LEAVE_WITHOUT_PHONE_VERIFICATION: You attempted to remove -// an account from the organization that does not yet have enough information -// to exist as a stand-alone account. This account requires you to first -// complete phone verification. Follow the steps at To leave an organization -// when all required account information has not yet been provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) +// an account from the organization that doesn't yet have enough information +// to exist as a standalone account. This account requires you to first complete +// phone verification. Follow the steps at To leave an organization when +// all required account information has not yet been provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) // in the AWS Organizations User Guide. // // * MASTER_ACCOUNT_PAYMENT_INSTRUMENT_REQUIRED: To create an organization -// with this account, you first must associate a payment instrument, such -// as a credit card, with the account. Follow the steps at To leave an organization -// when all required account information has not yet been provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) +// with this master account, you first must associate a payment instrument, +// such as a credit card, with the account. Follow the steps at To leave +// an organization when all required account information has not yet been +// provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) // in the AWS Organizations User Guide. // // * MEMBER_ACCOUNT_PAYMENT_INSTRUMENT_REQUIRED: To complete this operation @@ -4160,11 +4178,11 @@ func (c *Organizations) DisablePolicyTypeRequest(input *DisablePolicyTypeInput) // specific API or operation: // // * IMMUTABLE_POLICY: You specified a policy that is managed by AWS and -// cannot be modified. +// can't be modified. // // * INPUT_REQUIRED: You must include a value for all required parameters. // -// * INVALID_ENUM: You specified a value that is not valid for that parameter. +// * INVALID_ENUM: You specified a value that isn't valid for that parameter. // // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. @@ -4184,11 +4202,11 @@ func (c *Organizations) DisablePolicyTypeRequest(input *DisablePolicyTypeInput) // * INVALID_PATTERN_TARGET_ID: You specified a policy target ID that doesn't // match the required pattern. // -// * INVALID_ROLE_NAME: You provided a role name that is not valid. A role -// name can’t begin with the reserved prefix 'AWSServiceRoleFor'. +// * INVALID_ROLE_NAME: You provided a role name that isn't valid. A role +// name can't begin with the reserved prefix AWSServiceRoleFor. // -// * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid ARN for the -// organization. +// * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid Amazon Resource +// Name (ARN) for the organization. // // * INVALID_SYNTAX_POLICY_ID: You specified an invalid policy ID. // @@ -4211,7 +4229,7 @@ func (c *Organizations) DisablePolicyTypeRequest(input *DisablePolicyTypeInput) // between entities in the same root. // // * ErrCodePolicyTypeNotEnabledException "PolicyTypeNotEnabledException" -// The specified policy type is not currently enabled in this root. You cannot +// The specified policy type isn't currently enabled in this root. You can't // attach policies of the specified type to entities in a root until you enable // that type in the root. For more information, see Enabling All Features in // Your Organization (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_org_support-all-features.html) @@ -4333,7 +4351,7 @@ func (c *Organizations) EnableAWSServiceAccessRequest(input *EnableAWSServiceAcc // in the IAM User Guide. // // * ErrCodeAWSOrganizationsNotInUseException "AWSOrganizationsNotInUseException" -// Your account is not a member of an organization. To make this request, you +// Your account isn't a member of an organization. To make this request, you // must use the credentials of an account that belongs to an organization. // // * ErrCodeConcurrentModificationException "ConcurrentModificationException" @@ -4342,40 +4360,42 @@ func (c *Organizations) EnableAWSServiceAccessRequest(input *EnableAWSServiceAcc // // * ErrCodeConstraintViolationException "ConstraintViolationException" // Performing this operation violates a minimum or maximum value limit. For -// example, attempting to removing the last SCP from an OU or root, inviting -// or creating too many accounts to the organization, or attaching too many -// policies to an account, OU, or root. This exception includes a reason that -// contains additional information about the violated limit: +// example, attempting to removing the last service control policy (SCP) from +// an OU or root, inviting or creating too many accounts to the organization, +// or attaching too many policies to an account, OU, or root. This exception +// includes a reason that contains additional information about the violated +// limit. // // Some of the reasons in the following list might not be applicable to this // specific API or operation: // -// ACCOUNT_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the limit on the number -// of accounts in an organization. If you need more accounts, contact AWS Support -// to request an increase in your limit. +// * ACCOUNT_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the limit on +// the number of accounts in an organization. If you need more accounts, +// contactAWS Support (https://console.aws.amazon.com/support/home#/) to +// request an increase in your limit. // -// Or, The number of invitations that you tried to send would cause you to exceed -// the limit of accounts in your organization. Send fewer invitations, or contact -// AWS Support to request an increase in the number of accounts. +// Or the number of invitations that you tried to send would cause you to exceed +// the limit of accounts in your organization. Send fewer invitations or +// contact AWS Support to request an increase in the number of accounts. // -// Note: deleted and closed accounts still count toward your limit. +// Deleted and closed accounts still count toward your limit. // // If you get receive this exception when running a command immediately after -// creating the organization, wait one hour and try again. If after an hour -// it continues to fail with this error, contact AWS Customer Support (https://console.aws.amazon.com/support/home#/). +// creating the organization, wait one hour and try again. If after an hour +// it continues to fail with this error, contact AWS Support (https://console.aws.amazon.com/support/home#/). // // * HANDSHAKE_RATE_LIMIT_EXCEEDED: You attempted to exceed the number of -// handshakes you can send in one day. +// handshakes that you can send in one day. // -// * OU_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the number of organizational -// units you can have in an organization. +// * OU_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the number of OUs +// that you can have in an organization. // -// * OU_DEPTH_LIMIT_EXCEEDED: You attempted to create an organizational unit -// tree that is too many levels deep. +// * OU_DEPTH_LIMIT_EXCEEDED: You attempted to create an OU tree that is +// too many levels deep. // // * ORGANIZATION_NOT_IN_ALL_FEATURES_MODE: You attempted to perform an operation // that requires the organization to be configured to support all features. -// An organization that supports consolidated billing features only cannot +// An organization that supports only consolidated billing features can't // perform this operation. // // * POLICY_NUMBER_LIMIT_EXCEEDED. You attempted to exceed the number of @@ -4390,23 +4410,24 @@ func (c *Organizations) EnableAWSServiceAccessRequest(input *EnableAWSServiceAcc // minimum number of policies of a certain type required. // // * ACCOUNT_CANNOT_LEAVE_WITHOUT_EULA: You attempted to remove an account -// from the organization that does not yet have enough information to exist -// as a stand-alone account. This account requires you to first agree to -// the AWS Customer Agreement. Follow the steps at To leave an organization -// when all required account information has not yet been provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) +// from the organization that doesn't yet have enough information to exist +// as a standalone account. This account requires you to first agree to the +// AWS Customer Agreement. Follow the steps at To leave an organization when +// all required account information has not yet been provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) // in the AWS Organizations User Guide. // // * ACCOUNT_CANNOT_LEAVE_WITHOUT_PHONE_VERIFICATION: You attempted to remove -// an account from the organization that does not yet have enough information -// to exist as a stand-alone account. This account requires you to first -// complete phone verification. Follow the steps at To leave an organization -// when all required account information has not yet been provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) +// an account from the organization that doesn't yet have enough information +// to exist as a standalone account. This account requires you to first complete +// phone verification. Follow the steps at To leave an organization when +// all required account information has not yet been provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) // in the AWS Organizations User Guide. // // * MASTER_ACCOUNT_PAYMENT_INSTRUMENT_REQUIRED: To create an organization -// with this account, you first must associate a payment instrument, such -// as a credit card, with the account. Follow the steps at To leave an organization -// when all required account information has not yet been provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) +// with this master account, you first must associate a payment instrument, +// such as a credit card, with the account. Follow the steps at To leave +// an organization when all required account information has not yet been +// provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) // in the AWS Organizations User Guide. // // * MEMBER_ACCOUNT_PAYMENT_INSTRUMENT_REQUIRED: To complete this operation @@ -4439,11 +4460,11 @@ func (c *Organizations) EnableAWSServiceAccessRequest(input *EnableAWSServiceAcc // specific API or operation: // // * IMMUTABLE_POLICY: You specified a policy that is managed by AWS and -// cannot be modified. +// can't be modified. // // * INPUT_REQUIRED: You must include a value for all required parameters. // -// * INVALID_ENUM: You specified a value that is not valid for that parameter. +// * INVALID_ENUM: You specified a value that isn't valid for that parameter. // // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. @@ -4463,11 +4484,11 @@ func (c *Organizations) EnableAWSServiceAccessRequest(input *EnableAWSServiceAcc // * INVALID_PATTERN_TARGET_ID: You specified a policy target ID that doesn't // match the required pattern. // -// * INVALID_ROLE_NAME: You provided a role name that is not valid. A role -// name can’t begin with the reserved prefix 'AWSServiceRoleFor'. +// * INVALID_ROLE_NAME: You provided a role name that isn't valid. A role +// name can't begin with the reserved prefix AWSServiceRoleFor. // -// * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid ARN for the -// organization. +// * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid Amazon Resource +// Name (ARN) for the organization. // // * INVALID_SYNTAX_POLICY_ID: You specified an invalid policy ID. // @@ -4610,7 +4631,7 @@ func (c *Organizations) EnableAllFeaturesRequest(input *EnableAllFeaturesInput) // in the IAM User Guide. // // * ErrCodeAWSOrganizationsNotInUseException "AWSOrganizationsNotInUseException" -// Your account is not a member of an organization. To make this request, you +// Your account isn't a member of an organization. To make this request, you // must use the credentials of an account that belongs to an organization. // // * ErrCodeConcurrentModificationException "ConcurrentModificationException" @@ -4625,15 +4646,15 @@ func (c *Organizations) EnableAllFeaturesRequest(input *EnableAllFeaturesInput) // specific API or operation: // // * ACCOUNT_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the limit on -// the number of accounts in an organization. Note: deleted and closed accounts -// still count toward your limit. +// the number of accounts in an organization. Note that deleted and closed +// accounts still count toward your limit. // // If you get this exception immediately after creating the organization, wait // one hour and try again. If after an hour it continues to fail with this -// error, contact AWS Customer Support (https://console.aws.amazon.com/support/home#/). +// error, contact AWS Support (https://console.aws.amazon.com/support/home#/). // // * HANDSHAKE_RATE_LIMIT_EXCEEDED: You attempted to exceed the number of -// handshakes you can send in one day. +// handshakes that you can send in one day. // // * ALREADY_IN_AN_ORGANIZATION: The handshake request is invalid because // the invited account is already a member of an organization. @@ -4641,13 +4662,13 @@ func (c *Organizations) EnableAllFeaturesRequest(input *EnableAllFeaturesInput) // * ORGANIZATION_ALREADY_HAS_ALL_FEATURES: The handshake request is invalid // because the organization has already enabled all features. // -// * INVITE_DISABLED_DURING_ENABLE_ALL_FEATURES: You cannot issue new invitations -// to join an organization while it is in the process of enabling all features. +// * INVITE_DISABLED_DURING_ENABLE_ALL_FEATURES: You can't issue new invitations +// to join an organization while it's in the process of enabling all features. // You can resume inviting accounts after you finalize the process when all // accounts have agreed to the change. // -// * PAYMENT_INSTRUMENT_REQUIRED: You cannot complete the operation with -// an account that does not have a payment instrument, such as a credit card, +// * PAYMENT_INSTRUMENT_REQUIRED: You can't complete the operation with an +// account that doesn't have a payment instrument, such as a credit card, // associated with it. // // * ORGANIZATION_FROM_DIFFERENT_SELLER_OF_RECORD: The request failed because @@ -4668,11 +4689,11 @@ func (c *Organizations) EnableAllFeaturesRequest(input *EnableAllFeaturesInput) // specific API or operation: // // * IMMUTABLE_POLICY: You specified a policy that is managed by AWS and -// cannot be modified. +// can't be modified. // // * INPUT_REQUIRED: You must include a value for all required parameters. // -// * INVALID_ENUM: You specified a value that is not valid for that parameter. +// * INVALID_ENUM: You specified a value that isn't valid for that parameter. // // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. @@ -4692,11 +4713,11 @@ func (c *Organizations) EnableAllFeaturesRequest(input *EnableAllFeaturesInput) // * INVALID_PATTERN_TARGET_ID: You specified a policy target ID that doesn't // match the required pattern. // -// * INVALID_ROLE_NAME: You provided a role name that is not valid. A role -// name can’t begin with the reserved prefix 'AWSServiceRoleFor'. +// * INVALID_ROLE_NAME: You provided a role name that isn't valid. A role +// name can't begin with the reserved prefix AWSServiceRoleFor. // -// * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid ARN for the -// organization. +// * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid Amazon Resource +// Name (ARN) for the organization. // // * INVALID_SYNTAX_POLICY_ID: You specified an invalid policy ID. // @@ -4821,7 +4842,7 @@ func (c *Organizations) EnablePolicyTypeRequest(input *EnablePolicyTypeInput) (r // in the IAM User Guide. // // * ErrCodeAWSOrganizationsNotInUseException "AWSOrganizationsNotInUseException" -// Your account is not a member of an organization. To make this request, you +// Your account isn't a member of an organization. To make this request, you // must use the credentials of an account that belongs to an organization. // // * ErrCodeConcurrentModificationException "ConcurrentModificationException" @@ -4830,40 +4851,42 @@ func (c *Organizations) EnablePolicyTypeRequest(input *EnablePolicyTypeInput) (r // // * ErrCodeConstraintViolationException "ConstraintViolationException" // Performing this operation violates a minimum or maximum value limit. For -// example, attempting to removing the last SCP from an OU or root, inviting -// or creating too many accounts to the organization, or attaching too many -// policies to an account, OU, or root. This exception includes a reason that -// contains additional information about the violated limit: +// example, attempting to removing the last service control policy (SCP) from +// an OU or root, inviting or creating too many accounts to the organization, +// or attaching too many policies to an account, OU, or root. This exception +// includes a reason that contains additional information about the violated +// limit. // // Some of the reasons in the following list might not be applicable to this // specific API or operation: // -// ACCOUNT_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the limit on the number -// of accounts in an organization. If you need more accounts, contact AWS Support -// to request an increase in your limit. +// * ACCOUNT_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the limit on +// the number of accounts in an organization. If you need more accounts, +// contactAWS Support (https://console.aws.amazon.com/support/home#/) to +// request an increase in your limit. // -// Or, The number of invitations that you tried to send would cause you to exceed -// the limit of accounts in your organization. Send fewer invitations, or contact -// AWS Support to request an increase in the number of accounts. +// Or the number of invitations that you tried to send would cause you to exceed +// the limit of accounts in your organization. Send fewer invitations or +// contact AWS Support to request an increase in the number of accounts. // -// Note: deleted and closed accounts still count toward your limit. +// Deleted and closed accounts still count toward your limit. // // If you get receive this exception when running a command immediately after -// creating the organization, wait one hour and try again. If after an hour -// it continues to fail with this error, contact AWS Customer Support (https://console.aws.amazon.com/support/home#/). +// creating the organization, wait one hour and try again. If after an hour +// it continues to fail with this error, contact AWS Support (https://console.aws.amazon.com/support/home#/). // // * HANDSHAKE_RATE_LIMIT_EXCEEDED: You attempted to exceed the number of -// handshakes you can send in one day. +// handshakes that you can send in one day. // -// * OU_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the number of organizational -// units you can have in an organization. +// * OU_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the number of OUs +// that you can have in an organization. // -// * OU_DEPTH_LIMIT_EXCEEDED: You attempted to create an organizational unit -// tree that is too many levels deep. +// * OU_DEPTH_LIMIT_EXCEEDED: You attempted to create an OU tree that is +// too many levels deep. // // * ORGANIZATION_NOT_IN_ALL_FEATURES_MODE: You attempted to perform an operation // that requires the organization to be configured to support all features. -// An organization that supports consolidated billing features only cannot +// An organization that supports only consolidated billing features can't // perform this operation. // // * POLICY_NUMBER_LIMIT_EXCEEDED. You attempted to exceed the number of @@ -4878,23 +4901,24 @@ func (c *Organizations) EnablePolicyTypeRequest(input *EnablePolicyTypeInput) (r // minimum number of policies of a certain type required. // // * ACCOUNT_CANNOT_LEAVE_WITHOUT_EULA: You attempted to remove an account -// from the organization that does not yet have enough information to exist -// as a stand-alone account. This account requires you to first agree to -// the AWS Customer Agreement. Follow the steps at To leave an organization -// when all required account information has not yet been provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) +// from the organization that doesn't yet have enough information to exist +// as a standalone account. This account requires you to first agree to the +// AWS Customer Agreement. Follow the steps at To leave an organization when +// all required account information has not yet been provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) // in the AWS Organizations User Guide. // // * ACCOUNT_CANNOT_LEAVE_WITHOUT_PHONE_VERIFICATION: You attempted to remove -// an account from the organization that does not yet have enough information -// to exist as a stand-alone account. This account requires you to first -// complete phone verification. Follow the steps at To leave an organization -// when all required account information has not yet been provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) +// an account from the organization that doesn't yet have enough information +// to exist as a standalone account. This account requires you to first complete +// phone verification. Follow the steps at To leave an organization when +// all required account information has not yet been provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) // in the AWS Organizations User Guide. // // * MASTER_ACCOUNT_PAYMENT_INSTRUMENT_REQUIRED: To create an organization -// with this account, you first must associate a payment instrument, such -// as a credit card, with the account. Follow the steps at To leave an organization -// when all required account information has not yet been provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) +// with this master account, you first must associate a payment instrument, +// such as a credit card, with the account. Follow the steps at To leave +// an organization when all required account information has not yet been +// provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) // in the AWS Organizations User Guide. // // * MEMBER_ACCOUNT_PAYMENT_INSTRUMENT_REQUIRED: To complete this operation @@ -4927,11 +4951,11 @@ func (c *Organizations) EnablePolicyTypeRequest(input *EnablePolicyTypeInput) (r // specific API or operation: // // * IMMUTABLE_POLICY: You specified a policy that is managed by AWS and -// cannot be modified. +// can't be modified. // // * INPUT_REQUIRED: You must include a value for all required parameters. // -// * INVALID_ENUM: You specified a value that is not valid for that parameter. +// * INVALID_ENUM: You specified a value that isn't valid for that parameter. // // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. @@ -4951,11 +4975,11 @@ func (c *Organizations) EnablePolicyTypeRequest(input *EnablePolicyTypeInput) (r // * INVALID_PATTERN_TARGET_ID: You specified a policy target ID that doesn't // match the required pattern. // -// * INVALID_ROLE_NAME: You provided a role name that is not valid. A role -// name can’t begin with the reserved prefix 'AWSServiceRoleFor'. +// * INVALID_ROLE_NAME: You provided a role name that isn't valid. A role +// name can't begin with the reserved prefix AWSServiceRoleFor. // -// * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid ARN for the -// organization. +// * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid Amazon Resource +// Name (ARN) for the organization. // // * INVALID_SYNTAX_POLICY_ID: You specified an invalid policy ID. // @@ -4993,9 +5017,9 @@ func (c *Organizations) EnablePolicyTypeRequest(input *EnablePolicyTypeInput) (r // // * ErrCodePolicyTypeNotAvailableForOrganizationException "PolicyTypeNotAvailableForOrganizationException" // You can't use the specified policy type with the feature set currently enabled -// for this organization. For example, you can enable service control policies -// (SCPs) only after you enable all features in the organization. For more information, -// see Enabling and Disabling a Policy Type on a Root (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_policies.html#enable_policies_on_root) +// for this organization. For example, you can enable SCPs only after you enable +// all features in the organization. For more information, see Enabling and +// Disabling a Policy Type on a Root (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_policies.html#enable_policies_on_root) // in the AWS Organizations User Guide. // // See also, https://docs.aws.amazon.com/goto/WebAPI/organizations-2016-11-28/EnablePolicyType @@ -5099,9 +5123,15 @@ func (c *Organizations) InviteAccountToOrganizationRequest(input *InviteAccountT // in the IAM User Guide. // // * ErrCodeAWSOrganizationsNotInUseException "AWSOrganizationsNotInUseException" -// Your account is not a member of an organization. To make this request, you +// Your account isn't a member of an organization. To make this request, you // must use the credentials of an account that belongs to an organization. // +// * ErrCodeAccountOwnerNotVerifiedException "AccountOwnerNotVerifiedException" +// You can't invite an existing account to your organization until you verify +// that you own the email address associated with the master account. For more +// information, see Email Address Verification (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_create.html#about-email-verification) +// in the AWS Organizations User Guide. +// // * ErrCodeConcurrentModificationException "ConcurrentModificationException" // The target of the operation is currently being modified by a different request. // Try again later. @@ -5114,15 +5144,15 @@ func (c *Organizations) InviteAccountToOrganizationRequest(input *InviteAccountT // specific API or operation: // // * ACCOUNT_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the limit on -// the number of accounts in an organization. Note: deleted and closed accounts -// still count toward your limit. +// the number of accounts in an organization. Note that deleted and closed +// accounts still count toward your limit. // // If you get this exception immediately after creating the organization, wait // one hour and try again. If after an hour it continues to fail with this -// error, contact AWS Customer Support (https://console.aws.amazon.com/support/home#/). +// error, contact AWS Support (https://console.aws.amazon.com/support/home#/). // // * HANDSHAKE_RATE_LIMIT_EXCEEDED: You attempted to exceed the number of -// handshakes you can send in one day. +// handshakes that you can send in one day. // // * ALREADY_IN_AN_ORGANIZATION: The handshake request is invalid because // the invited account is already a member of an organization. @@ -5130,13 +5160,13 @@ func (c *Organizations) InviteAccountToOrganizationRequest(input *InviteAccountT // * ORGANIZATION_ALREADY_HAS_ALL_FEATURES: The handshake request is invalid // because the organization has already enabled all features. // -// * INVITE_DISABLED_DURING_ENABLE_ALL_FEATURES: You cannot issue new invitations -// to join an organization while it is in the process of enabling all features. +// * INVITE_DISABLED_DURING_ENABLE_ALL_FEATURES: You can't issue new invitations +// to join an organization while it's in the process of enabling all features. // You can resume inviting accounts after you finalize the process when all // accounts have agreed to the change. // -// * PAYMENT_INSTRUMENT_REQUIRED: You cannot complete the operation with -// an account that does not have a payment instrument, such as a credit card, +// * PAYMENT_INSTRUMENT_REQUIRED: You can't complete the operation with an +// account that doesn't have a payment instrument, such as a credit card, // associated with it. // // * ORGANIZATION_FROM_DIFFERENT_SELLER_OF_RECORD: The request failed because @@ -5164,11 +5194,11 @@ func (c *Organizations) InviteAccountToOrganizationRequest(input *InviteAccountT // specific API or operation: // // * IMMUTABLE_POLICY: You specified a policy that is managed by AWS and -// cannot be modified. +// can't be modified. // // * INPUT_REQUIRED: You must include a value for all required parameters. // -// * INVALID_ENUM: You specified a value that is not valid for that parameter. +// * INVALID_ENUM: You specified a value that isn't valid for that parameter. // // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. @@ -5188,11 +5218,11 @@ func (c *Organizations) InviteAccountToOrganizationRequest(input *InviteAccountT // * INVALID_PATTERN_TARGET_ID: You specified a policy target ID that doesn't // match the required pattern. // -// * INVALID_ROLE_NAME: You provided a role name that is not valid. A role -// name can’t begin with the reserved prefix 'AWSServiceRoleFor'. +// * INVALID_ROLE_NAME: You provided a role name that isn't valid. A role +// name can't begin with the reserved prefix AWSServiceRoleFor. // -// * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid ARN for the -// organization. +// * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid Amazon Resource +// Name (ARN) for the organization. // // * INVALID_SYNTAX_POLICY_ID: You specified an invalid policy ID. // @@ -5215,10 +5245,10 @@ func (c *Organizations) InviteAccountToOrganizationRequest(input *InviteAccountT // between entities in the same root. // // * ErrCodeFinalizingOrganizationException "FinalizingOrganizationException" -// AWS Organizations could not perform the operation because your organization -// has not finished initializing. This can take up to an hour. Try again later. -// If after one hour you continue to receive this error, contact AWS Customer -// Support (https://console.aws.amazon.com/support/home#/). +// AWS Organizations couldn't perform the operation because your organization +// hasn't finished initializing. This can take up to an hour. Try again later. +// If after one hour you continue to receive this error, contact AWS Support +// (https://console.aws.amazon.com/support/home#/). // // * ErrCodeServiceException "ServiceException" // AWS Organizations can't complete your request because of an internal service @@ -5343,11 +5373,11 @@ func (c *Organizations) LeaveOrganizationRequest(input *LeaveOrganizationInput) // // * ErrCodeAccountNotFoundException "AccountNotFoundException" // We can't find an AWS account with the AccountId that you specified, or the -// account whose credentials you used to make this request is not a member of +// account whose credentials you used to make this request isn't a member of // an organization. // // * ErrCodeAWSOrganizationsNotInUseException "AWSOrganizationsNotInUseException" -// Your account is not a member of an organization. To make this request, you +// Your account isn't a member of an organization. To make this request, you // must use the credentials of an account that belongs to an organization. // // * ErrCodeConcurrentModificationException "ConcurrentModificationException" @@ -5356,40 +5386,42 @@ func (c *Organizations) LeaveOrganizationRequest(input *LeaveOrganizationInput) // // * ErrCodeConstraintViolationException "ConstraintViolationException" // Performing this operation violates a minimum or maximum value limit. For -// example, attempting to removing the last SCP from an OU or root, inviting -// or creating too many accounts to the organization, or attaching too many -// policies to an account, OU, or root. This exception includes a reason that -// contains additional information about the violated limit: +// example, attempting to removing the last service control policy (SCP) from +// an OU or root, inviting or creating too many accounts to the organization, +// or attaching too many policies to an account, OU, or root. This exception +// includes a reason that contains additional information about the violated +// limit. // // Some of the reasons in the following list might not be applicable to this // specific API or operation: // -// ACCOUNT_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the limit on the number -// of accounts in an organization. If you need more accounts, contact AWS Support -// to request an increase in your limit. +// * ACCOUNT_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the limit on +// the number of accounts in an organization. If you need more accounts, +// contactAWS Support (https://console.aws.amazon.com/support/home#/) to +// request an increase in your limit. // -// Or, The number of invitations that you tried to send would cause you to exceed -// the limit of accounts in your organization. Send fewer invitations, or contact -// AWS Support to request an increase in the number of accounts. +// Or the number of invitations that you tried to send would cause you to exceed +// the limit of accounts in your organization. Send fewer invitations or +// contact AWS Support to request an increase in the number of accounts. // -// Note: deleted and closed accounts still count toward your limit. +// Deleted and closed accounts still count toward your limit. // // If you get receive this exception when running a command immediately after -// creating the organization, wait one hour and try again. If after an hour -// it continues to fail with this error, contact AWS Customer Support (https://console.aws.amazon.com/support/home#/). +// creating the organization, wait one hour and try again. If after an hour +// it continues to fail with this error, contact AWS Support (https://console.aws.amazon.com/support/home#/). // // * HANDSHAKE_RATE_LIMIT_EXCEEDED: You attempted to exceed the number of -// handshakes you can send in one day. +// handshakes that you can send in one day. // -// * OU_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the number of organizational -// units you can have in an organization. +// * OU_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the number of OUs +// that you can have in an organization. // -// * OU_DEPTH_LIMIT_EXCEEDED: You attempted to create an organizational unit -// tree that is too many levels deep. +// * OU_DEPTH_LIMIT_EXCEEDED: You attempted to create an OU tree that is +// too many levels deep. // // * ORGANIZATION_NOT_IN_ALL_FEATURES_MODE: You attempted to perform an operation // that requires the organization to be configured to support all features. -// An organization that supports consolidated billing features only cannot +// An organization that supports only consolidated billing features can't // perform this operation. // // * POLICY_NUMBER_LIMIT_EXCEEDED. You attempted to exceed the number of @@ -5404,23 +5436,24 @@ func (c *Organizations) LeaveOrganizationRequest(input *LeaveOrganizationInput) // minimum number of policies of a certain type required. // // * ACCOUNT_CANNOT_LEAVE_WITHOUT_EULA: You attempted to remove an account -// from the organization that does not yet have enough information to exist -// as a stand-alone account. This account requires you to first agree to -// the AWS Customer Agreement. Follow the steps at To leave an organization -// when all required account information has not yet been provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) +// from the organization that doesn't yet have enough information to exist +// as a standalone account. This account requires you to first agree to the +// AWS Customer Agreement. Follow the steps at To leave an organization when +// all required account information has not yet been provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) // in the AWS Organizations User Guide. // // * ACCOUNT_CANNOT_LEAVE_WITHOUT_PHONE_VERIFICATION: You attempted to remove -// an account from the organization that does not yet have enough information -// to exist as a stand-alone account. This account requires you to first -// complete phone verification. Follow the steps at To leave an organization -// when all required account information has not yet been provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) +// an account from the organization that doesn't yet have enough information +// to exist as a standalone account. This account requires you to first complete +// phone verification. Follow the steps at To leave an organization when +// all required account information has not yet been provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) // in the AWS Organizations User Guide. // // * MASTER_ACCOUNT_PAYMENT_INSTRUMENT_REQUIRED: To create an organization -// with this account, you first must associate a payment instrument, such -// as a credit card, with the account. Follow the steps at To leave an organization -// when all required account information has not yet been provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) +// with this master account, you first must associate a payment instrument, +// such as a credit card, with the account. Follow the steps at To leave +// an organization when all required account information has not yet been +// provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) // in the AWS Organizations User Guide. // // * MEMBER_ACCOUNT_PAYMENT_INSTRUMENT_REQUIRED: To complete this operation @@ -5453,11 +5486,11 @@ func (c *Organizations) LeaveOrganizationRequest(input *LeaveOrganizationInput) // specific API or operation: // // * IMMUTABLE_POLICY: You specified a policy that is managed by AWS and -// cannot be modified. +// can't be modified. // // * INPUT_REQUIRED: You must include a value for all required parameters. // -// * INVALID_ENUM: You specified a value that is not valid for that parameter. +// * INVALID_ENUM: You specified a value that isn't valid for that parameter. // // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. @@ -5477,11 +5510,11 @@ func (c *Organizations) LeaveOrganizationRequest(input *LeaveOrganizationInput) // * INVALID_PATTERN_TARGET_ID: You specified a policy target ID that doesn't // match the required pattern. // -// * INVALID_ROLE_NAME: You provided a role name that is not valid. A role -// name can’t begin with the reserved prefix 'AWSServiceRoleFor'. +// * INVALID_ROLE_NAME: You provided a role name that isn't valid. A role +// name can't begin with the reserved prefix AWSServiceRoleFor. // -// * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid ARN for the -// organization. +// * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid Amazon Resource +// Name (ARN) for the organization. // // * INVALID_SYNTAX_POLICY_ID: You specified an invalid policy ID. // @@ -5616,45 +5649,47 @@ func (c *Organizations) ListAWSServiceAccessForOrganizationRequest(input *ListAW // in the IAM User Guide. // // * ErrCodeAWSOrganizationsNotInUseException "AWSOrganizationsNotInUseException" -// Your account is not a member of an organization. To make this request, you +// Your account isn't a member of an organization. To make this request, you // must use the credentials of an account that belongs to an organization. // // * ErrCodeConstraintViolationException "ConstraintViolationException" // Performing this operation violates a minimum or maximum value limit. For -// example, attempting to removing the last SCP from an OU or root, inviting -// or creating too many accounts to the organization, or attaching too many -// policies to an account, OU, or root. This exception includes a reason that -// contains additional information about the violated limit: +// example, attempting to removing the last service control policy (SCP) from +// an OU or root, inviting or creating too many accounts to the organization, +// or attaching too many policies to an account, OU, or root. This exception +// includes a reason that contains additional information about the violated +// limit. // // Some of the reasons in the following list might not be applicable to this // specific API or operation: // -// ACCOUNT_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the limit on the number -// of accounts in an organization. If you need more accounts, contact AWS Support -// to request an increase in your limit. +// * ACCOUNT_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the limit on +// the number of accounts in an organization. If you need more accounts, +// contactAWS Support (https://console.aws.amazon.com/support/home#/) to +// request an increase in your limit. // -// Or, The number of invitations that you tried to send would cause you to exceed -// the limit of accounts in your organization. Send fewer invitations, or contact -// AWS Support to request an increase in the number of accounts. +// Or the number of invitations that you tried to send would cause you to exceed +// the limit of accounts in your organization. Send fewer invitations or +// contact AWS Support to request an increase in the number of accounts. // -// Note: deleted and closed accounts still count toward your limit. +// Deleted and closed accounts still count toward your limit. // // If you get receive this exception when running a command immediately after -// creating the organization, wait one hour and try again. If after an hour -// it continues to fail with this error, contact AWS Customer Support (https://console.aws.amazon.com/support/home#/). +// creating the organization, wait one hour and try again. If after an hour +// it continues to fail with this error, contact AWS Support (https://console.aws.amazon.com/support/home#/). // // * HANDSHAKE_RATE_LIMIT_EXCEEDED: You attempted to exceed the number of -// handshakes you can send in one day. +// handshakes that you can send in one day. // -// * OU_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the number of organizational -// units you can have in an organization. +// * OU_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the number of OUs +// that you can have in an organization. // -// * OU_DEPTH_LIMIT_EXCEEDED: You attempted to create an organizational unit -// tree that is too many levels deep. +// * OU_DEPTH_LIMIT_EXCEEDED: You attempted to create an OU tree that is +// too many levels deep. // // * ORGANIZATION_NOT_IN_ALL_FEATURES_MODE: You attempted to perform an operation // that requires the organization to be configured to support all features. -// An organization that supports consolidated billing features only cannot +// An organization that supports only consolidated billing features can't // perform this operation. // // * POLICY_NUMBER_LIMIT_EXCEEDED. You attempted to exceed the number of @@ -5669,23 +5704,24 @@ func (c *Organizations) ListAWSServiceAccessForOrganizationRequest(input *ListAW // minimum number of policies of a certain type required. // // * ACCOUNT_CANNOT_LEAVE_WITHOUT_EULA: You attempted to remove an account -// from the organization that does not yet have enough information to exist -// as a stand-alone account. This account requires you to first agree to -// the AWS Customer Agreement. Follow the steps at To leave an organization -// when all required account information has not yet been provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) +// from the organization that doesn't yet have enough information to exist +// as a standalone account. This account requires you to first agree to the +// AWS Customer Agreement. Follow the steps at To leave an organization when +// all required account information has not yet been provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) // in the AWS Organizations User Guide. // // * ACCOUNT_CANNOT_LEAVE_WITHOUT_PHONE_VERIFICATION: You attempted to remove -// an account from the organization that does not yet have enough information -// to exist as a stand-alone account. This account requires you to first -// complete phone verification. Follow the steps at To leave an organization -// when all required account information has not yet been provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) +// an account from the organization that doesn't yet have enough information +// to exist as a standalone account. This account requires you to first complete +// phone verification. Follow the steps at To leave an organization when +// all required account information has not yet been provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) // in the AWS Organizations User Guide. // // * MASTER_ACCOUNT_PAYMENT_INSTRUMENT_REQUIRED: To create an organization -// with this account, you first must associate a payment instrument, such -// as a credit card, with the account. Follow the steps at To leave an organization -// when all required account information has not yet been provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) +// with this master account, you first must associate a payment instrument, +// such as a credit card, with the account. Follow the steps at To leave +// an organization when all required account information has not yet been +// provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) // in the AWS Organizations User Guide. // // * MEMBER_ACCOUNT_PAYMENT_INSTRUMENT_REQUIRED: To complete this operation @@ -5718,11 +5754,11 @@ func (c *Organizations) ListAWSServiceAccessForOrganizationRequest(input *ListAW // specific API or operation: // // * IMMUTABLE_POLICY: You specified a policy that is managed by AWS and -// cannot be modified. +// can't be modified. // // * INPUT_REQUIRED: You must include a value for all required parameters. // -// * INVALID_ENUM: You specified a value that is not valid for that parameter. +// * INVALID_ENUM: You specified a value that isn't valid for that parameter. // // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. @@ -5742,11 +5778,11 @@ func (c *Organizations) ListAWSServiceAccessForOrganizationRequest(input *ListAW // * INVALID_PATTERN_TARGET_ID: You specified a policy target ID that doesn't // match the required pattern. // -// * INVALID_ROLE_NAME: You provided a role name that is not valid. A role -// name can’t begin with the reserved prefix 'AWSServiceRoleFor'. +// * INVALID_ROLE_NAME: You provided a role name that isn't valid. A role +// name can't begin with the reserved prefix AWSServiceRoleFor. // -// * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid ARN for the -// organization. +// * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid Amazon Resource +// Name (ARN) for the organization. // // * INVALID_SYNTAX_POLICY_ID: You specified an invalid policy ID. // @@ -5925,7 +5961,7 @@ func (c *Organizations) ListAccountsRequest(input *ListAccountsInput) (req *requ // in the IAM User Guide. // // * ErrCodeAWSOrganizationsNotInUseException "AWSOrganizationsNotInUseException" -// Your account is not a member of an organization. To make this request, you +// Your account isn't a member of an organization. To make this request, you // must use the credentials of an account that belongs to an organization. // // * ErrCodeInvalidInputException "InvalidInputException" @@ -5937,11 +5973,11 @@ func (c *Organizations) ListAccountsRequest(input *ListAccountsInput) (req *requ // specific API or operation: // // * IMMUTABLE_POLICY: You specified a policy that is managed by AWS and -// cannot be modified. +// can't be modified. // // * INPUT_REQUIRED: You must include a value for all required parameters. // -// * INVALID_ENUM: You specified a value that is not valid for that parameter. +// * INVALID_ENUM: You specified a value that isn't valid for that parameter. // // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. @@ -5961,11 +5997,11 @@ func (c *Organizations) ListAccountsRequest(input *ListAccountsInput) (req *requ // * INVALID_PATTERN_TARGET_ID: You specified a policy target ID that doesn't // match the required pattern. // -// * INVALID_ROLE_NAME: You provided a role name that is not valid. A role -// name can’t begin with the reserved prefix 'AWSServiceRoleFor'. +// * INVALID_ROLE_NAME: You provided a role name that isn't valid. A role +// name can't begin with the reserved prefix AWSServiceRoleFor. // -// * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid ARN for the -// organization. +// * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid Amazon Resource +// Name (ARN) for the organization. // // * INVALID_SYNTAX_POLICY_ID: You specified an invalid policy ID. // @@ -6147,7 +6183,7 @@ func (c *Organizations) ListAccountsForParentRequest(input *ListAccountsForParen // in the IAM User Guide. // // * ErrCodeAWSOrganizationsNotInUseException "AWSOrganizationsNotInUseException" -// Your account is not a member of an organization. To make this request, you +// Your account isn't a member of an organization. To make this request, you // must use the credentials of an account that belongs to an organization. // // * ErrCodeInvalidInputException "InvalidInputException" @@ -6159,11 +6195,11 @@ func (c *Organizations) ListAccountsForParentRequest(input *ListAccountsForParen // specific API or operation: // // * IMMUTABLE_POLICY: You specified a policy that is managed by AWS and -// cannot be modified. +// can't be modified. // // * INPUT_REQUIRED: You must include a value for all required parameters. // -// * INVALID_ENUM: You specified a value that is not valid for that parameter. +// * INVALID_ENUM: You specified a value that isn't valid for that parameter. // // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. @@ -6183,11 +6219,11 @@ func (c *Organizations) ListAccountsForParentRequest(input *ListAccountsForParen // * INVALID_PATTERN_TARGET_ID: You specified a policy target ID that doesn't // match the required pattern. // -// * INVALID_ROLE_NAME: You provided a role name that is not valid. A role -// name can’t begin with the reserved prefix 'AWSServiceRoleFor'. +// * INVALID_ROLE_NAME: You provided a role name that isn't valid. A role +// name can't begin with the reserved prefix AWSServiceRoleFor. // -// * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid ARN for the -// organization. +// * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid Amazon Resource +// Name (ARN) for the organization. // // * INVALID_SYNTAX_POLICY_ID: You specified an invalid policy ID. // @@ -6210,8 +6246,7 @@ func (c *Organizations) ListAccountsForParentRequest(input *ListAccountsForParen // between entities in the same root. // // * ErrCodeParentNotFoundException "ParentNotFoundException" -// We can't find a root or organizational unit (OU) with the ParentId that you -// specified. +// We can't find a root or OU with the ParentId that you specified. // // * ErrCodeServiceException "ServiceException" // AWS Organizations can't complete your request because of an internal service @@ -6370,7 +6405,7 @@ func (c *Organizations) ListChildrenRequest(input *ListChildrenInput) (req *requ // in the IAM User Guide. // // * ErrCodeAWSOrganizationsNotInUseException "AWSOrganizationsNotInUseException" -// Your account is not a member of an organization. To make this request, you +// Your account isn't a member of an organization. To make this request, you // must use the credentials of an account that belongs to an organization. // // * ErrCodeInvalidInputException "InvalidInputException" @@ -6382,11 +6417,11 @@ func (c *Organizations) ListChildrenRequest(input *ListChildrenInput) (req *requ // specific API or operation: // // * IMMUTABLE_POLICY: You specified a policy that is managed by AWS and -// cannot be modified. +// can't be modified. // // * INPUT_REQUIRED: You must include a value for all required parameters. // -// * INVALID_ENUM: You specified a value that is not valid for that parameter. +// * INVALID_ENUM: You specified a value that isn't valid for that parameter. // // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. @@ -6406,11 +6441,11 @@ func (c *Organizations) ListChildrenRequest(input *ListChildrenInput) (req *requ // * INVALID_PATTERN_TARGET_ID: You specified a policy target ID that doesn't // match the required pattern. // -// * INVALID_ROLE_NAME: You provided a role name that is not valid. A role -// name can’t begin with the reserved prefix 'AWSServiceRoleFor'. +// * INVALID_ROLE_NAME: You provided a role name that isn't valid. A role +// name can't begin with the reserved prefix AWSServiceRoleFor. // -// * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid ARN for the -// organization. +// * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid Amazon Resource +// Name (ARN) for the organization. // // * INVALID_SYNTAX_POLICY_ID: You specified an invalid policy ID. // @@ -6433,8 +6468,7 @@ func (c *Organizations) ListChildrenRequest(input *ListChildrenInput) (req *requ // between entities in the same root. // // * ErrCodeParentNotFoundException "ParentNotFoundException" -// We can't find a root or organizational unit (OU) with the ParentId that you -// specified. +// We can't find a root or OU with the ParentId that you specified. // // * ErrCodeServiceException "ServiceException" // AWS Organizations can't complete your request because of an internal service @@ -6592,7 +6626,7 @@ func (c *Organizations) ListCreateAccountStatusRequest(input *ListCreateAccountS // in the IAM User Guide. // // * ErrCodeAWSOrganizationsNotInUseException "AWSOrganizationsNotInUseException" -// Your account is not a member of an organization. To make this request, you +// Your account isn't a member of an organization. To make this request, you // must use the credentials of an account that belongs to an organization. // // * ErrCodeInvalidInputException "InvalidInputException" @@ -6604,11 +6638,11 @@ func (c *Organizations) ListCreateAccountStatusRequest(input *ListCreateAccountS // specific API or operation: // // * IMMUTABLE_POLICY: You specified a policy that is managed by AWS and -// cannot be modified. +// can't be modified. // // * INPUT_REQUIRED: You must include a value for all required parameters. // -// * INVALID_ENUM: You specified a value that is not valid for that parameter. +// * INVALID_ENUM: You specified a value that isn't valid for that parameter. // // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. @@ -6628,11 +6662,11 @@ func (c *Organizations) ListCreateAccountStatusRequest(input *ListCreateAccountS // * INVALID_PATTERN_TARGET_ID: You specified a policy target ID that doesn't // match the required pattern. // -// * INVALID_ROLE_NAME: You provided a role name that is not valid. A role -// name can’t begin with the reserved prefix 'AWSServiceRoleFor'. +// * INVALID_ROLE_NAME: You provided a role name that isn't valid. A role +// name can't begin with the reserved prefix AWSServiceRoleFor. // -// * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid ARN for the -// organization. +// * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid Amazon Resource +// Name (ARN) for the organization. // // * INVALID_SYNTAX_POLICY_ID: You specified an invalid policy ID. // @@ -6826,11 +6860,11 @@ func (c *Organizations) ListHandshakesForAccountRequest(input *ListHandshakesFor // specific API or operation: // // * IMMUTABLE_POLICY: You specified a policy that is managed by AWS and -// cannot be modified. +// can't be modified. // // * INPUT_REQUIRED: You must include a value for all required parameters. // -// * INVALID_ENUM: You specified a value that is not valid for that parameter. +// * INVALID_ENUM: You specified a value that isn't valid for that parameter. // // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. @@ -6850,11 +6884,11 @@ func (c *Organizations) ListHandshakesForAccountRequest(input *ListHandshakesFor // * INVALID_PATTERN_TARGET_ID: You specified a policy target ID that doesn't // match the required pattern. // -// * INVALID_ROLE_NAME: You provided a role name that is not valid. A role -// name can’t begin with the reserved prefix 'AWSServiceRoleFor'. +// * INVALID_ROLE_NAME: You provided a role name that isn't valid. A role +// name can't begin with the reserved prefix AWSServiceRoleFor. // -// * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid ARN for the -// organization. +// * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid Amazon Resource +// Name (ARN) for the organization. // // * INVALID_SYNTAX_POLICY_ID: You specified an invalid policy ID. // @@ -7038,7 +7072,7 @@ func (c *Organizations) ListHandshakesForOrganizationRequest(input *ListHandshak // in the IAM User Guide. // // * ErrCodeAWSOrganizationsNotInUseException "AWSOrganizationsNotInUseException" -// Your account is not a member of an organization. To make this request, you +// Your account isn't a member of an organization. To make this request, you // must use the credentials of an account that belongs to an organization. // // * ErrCodeConcurrentModificationException "ConcurrentModificationException" @@ -7054,11 +7088,11 @@ func (c *Organizations) ListHandshakesForOrganizationRequest(input *ListHandshak // specific API or operation: // // * IMMUTABLE_POLICY: You specified a policy that is managed by AWS and -// cannot be modified. +// can't be modified. // // * INPUT_REQUIRED: You must include a value for all required parameters. // -// * INVALID_ENUM: You specified a value that is not valid for that parameter. +// * INVALID_ENUM: You specified a value that isn't valid for that parameter. // // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. @@ -7078,11 +7112,11 @@ func (c *Organizations) ListHandshakesForOrganizationRequest(input *ListHandshak // * INVALID_PATTERN_TARGET_ID: You specified a policy target ID that doesn't // match the required pattern. // -// * INVALID_ROLE_NAME: You provided a role name that is not valid. A role -// name can’t begin with the reserved prefix 'AWSServiceRoleFor'. +// * INVALID_ROLE_NAME: You provided a role name that isn't valid. A role +// name can't begin with the reserved prefix AWSServiceRoleFor. // -// * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid ARN for the -// organization. +// * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid Amazon Resource +// Name (ARN) for the organization. // // * INVALID_SYNTAX_POLICY_ID: You specified an invalid policy ID. // @@ -7259,7 +7293,7 @@ func (c *Organizations) ListOrganizationalUnitsForParentRequest(input *ListOrgan // in the IAM User Guide. // // * ErrCodeAWSOrganizationsNotInUseException "AWSOrganizationsNotInUseException" -// Your account is not a member of an organization. To make this request, you +// Your account isn't a member of an organization. To make this request, you // must use the credentials of an account that belongs to an organization. // // * ErrCodeInvalidInputException "InvalidInputException" @@ -7271,11 +7305,11 @@ func (c *Organizations) ListOrganizationalUnitsForParentRequest(input *ListOrgan // specific API or operation: // // * IMMUTABLE_POLICY: You specified a policy that is managed by AWS and -// cannot be modified. +// can't be modified. // // * INPUT_REQUIRED: You must include a value for all required parameters. // -// * INVALID_ENUM: You specified a value that is not valid for that parameter. +// * INVALID_ENUM: You specified a value that isn't valid for that parameter. // // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. @@ -7295,11 +7329,11 @@ func (c *Organizations) ListOrganizationalUnitsForParentRequest(input *ListOrgan // * INVALID_PATTERN_TARGET_ID: You specified a policy target ID that doesn't // match the required pattern. // -// * INVALID_ROLE_NAME: You provided a role name that is not valid. A role -// name can’t begin with the reserved prefix 'AWSServiceRoleFor'. +// * INVALID_ROLE_NAME: You provided a role name that isn't valid. A role +// name can't begin with the reserved prefix AWSServiceRoleFor. // -// * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid ARN for the -// organization. +// * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid Amazon Resource +// Name (ARN) for the organization. // // * INVALID_SYNTAX_POLICY_ID: You specified an invalid policy ID. // @@ -7322,8 +7356,7 @@ func (c *Organizations) ListOrganizationalUnitsForParentRequest(input *ListOrgan // between entities in the same root. // // * ErrCodeParentNotFoundException "ParentNotFoundException" -// We can't find a root or organizational unit (OU) with the ParentId that you -// specified. +// We can't find a root or OU with the ParentId that you specified. // // * ErrCodeServiceException "ServiceException" // AWS Organizations can't complete your request because of an internal service @@ -7484,7 +7517,7 @@ func (c *Organizations) ListParentsRequest(input *ListParentsInput) (req *reques // in the IAM User Guide. // // * ErrCodeAWSOrganizationsNotInUseException "AWSOrganizationsNotInUseException" -// Your account is not a member of an organization. To make this request, you +// Your account isn't a member of an organization. To make this request, you // must use the credentials of an account that belongs to an organization. // // * ErrCodeChildNotFoundException "ChildNotFoundException" @@ -7500,11 +7533,11 @@ func (c *Organizations) ListParentsRequest(input *ListParentsInput) (req *reques // specific API or operation: // // * IMMUTABLE_POLICY: You specified a policy that is managed by AWS and -// cannot be modified. +// can't be modified. // // * INPUT_REQUIRED: You must include a value for all required parameters. // -// * INVALID_ENUM: You specified a value that is not valid for that parameter. +// * INVALID_ENUM: You specified a value that isn't valid for that parameter. // // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. @@ -7524,11 +7557,11 @@ func (c *Organizations) ListParentsRequest(input *ListParentsInput) (req *reques // * INVALID_PATTERN_TARGET_ID: You specified a policy target ID that doesn't // match the required pattern. // -// * INVALID_ROLE_NAME: You provided a role name that is not valid. A role -// name can’t begin with the reserved prefix 'AWSServiceRoleFor'. +// * INVALID_ROLE_NAME: You provided a role name that isn't valid. A role +// name can't begin with the reserved prefix AWSServiceRoleFor. // -// * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid ARN for the -// organization. +// * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid Amazon Resource +// Name (ARN) for the organization. // // * INVALID_SYNTAX_POLICY_ID: You specified an invalid policy ID. // @@ -7705,7 +7738,7 @@ func (c *Organizations) ListPoliciesRequest(input *ListPoliciesInput) (req *requ // in the IAM User Guide. // // * ErrCodeAWSOrganizationsNotInUseException "AWSOrganizationsNotInUseException" -// Your account is not a member of an organization. To make this request, you +// Your account isn't a member of an organization. To make this request, you // must use the credentials of an account that belongs to an organization. // // * ErrCodeInvalidInputException "InvalidInputException" @@ -7717,11 +7750,11 @@ func (c *Organizations) ListPoliciesRequest(input *ListPoliciesInput) (req *requ // specific API or operation: // // * IMMUTABLE_POLICY: You specified a policy that is managed by AWS and -// cannot be modified. +// can't be modified. // // * INPUT_REQUIRED: You must include a value for all required parameters. // -// * INVALID_ENUM: You specified a value that is not valid for that parameter. +// * INVALID_ENUM: You specified a value that isn't valid for that parameter. // // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. @@ -7741,11 +7774,11 @@ func (c *Organizations) ListPoliciesRequest(input *ListPoliciesInput) (req *requ // * INVALID_PATTERN_TARGET_ID: You specified a policy target ID that doesn't // match the required pattern. // -// * INVALID_ROLE_NAME: You provided a role name that is not valid. A role -// name can’t begin with the reserved prefix 'AWSServiceRoleFor'. +// * INVALID_ROLE_NAME: You provided a role name that isn't valid. A role +// name can't begin with the reserved prefix AWSServiceRoleFor. // -// * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid ARN for the -// organization. +// * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid Amazon Resource +// Name (ARN) for the organization. // // * INVALID_SYNTAX_POLICY_ID: You specified an invalid policy ID. // @@ -7924,7 +7957,7 @@ func (c *Organizations) ListPoliciesForTargetRequest(input *ListPoliciesForTarge // in the IAM User Guide. // // * ErrCodeAWSOrganizationsNotInUseException "AWSOrganizationsNotInUseException" -// Your account is not a member of an organization. To make this request, you +// Your account isn't a member of an organization. To make this request, you // must use the credentials of an account that belongs to an organization. // // * ErrCodeInvalidInputException "InvalidInputException" @@ -7936,11 +7969,11 @@ func (c *Organizations) ListPoliciesForTargetRequest(input *ListPoliciesForTarge // specific API or operation: // // * IMMUTABLE_POLICY: You specified a policy that is managed by AWS and -// cannot be modified. +// can't be modified. // // * INPUT_REQUIRED: You must include a value for all required parameters. // -// * INVALID_ENUM: You specified a value that is not valid for that parameter. +// * INVALID_ENUM: You specified a value that isn't valid for that parameter. // // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. @@ -7960,11 +7993,11 @@ func (c *Organizations) ListPoliciesForTargetRequest(input *ListPoliciesForTarge // * INVALID_PATTERN_TARGET_ID: You specified a policy target ID that doesn't // match the required pattern. // -// * INVALID_ROLE_NAME: You provided a role name that is not valid. A role -// name can’t begin with the reserved prefix 'AWSServiceRoleFor'. +// * INVALID_ROLE_NAME: You provided a role name that isn't valid. A role +// name can't begin with the reserved prefix AWSServiceRoleFor. // -// * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid ARN for the -// organization. +// * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid Amazon Resource +// Name (ARN) for the organization. // // * INVALID_SYNTAX_POLICY_ID: You specified an invalid policy ID. // @@ -8150,7 +8183,7 @@ func (c *Organizations) ListRootsRequest(input *ListRootsInput) (req *request.Re // in the IAM User Guide. // // * ErrCodeAWSOrganizationsNotInUseException "AWSOrganizationsNotInUseException" -// Your account is not a member of an organization. To make this request, you +// Your account isn't a member of an organization. To make this request, you // must use the credentials of an account that belongs to an organization. // // * ErrCodeInvalidInputException "InvalidInputException" @@ -8162,11 +8195,11 @@ func (c *Organizations) ListRootsRequest(input *ListRootsInput) (req *request.Re // specific API or operation: // // * IMMUTABLE_POLICY: You specified a policy that is managed by AWS and -// cannot be modified. +// can't be modified. // // * INPUT_REQUIRED: You must include a value for all required parameters. // -// * INVALID_ENUM: You specified a value that is not valid for that parameter. +// * INVALID_ENUM: You specified a value that isn't valid for that parameter. // // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. @@ -8186,11 +8219,11 @@ func (c *Organizations) ListRootsRequest(input *ListRootsInput) (req *request.Re // * INVALID_PATTERN_TARGET_ID: You specified a policy target ID that doesn't // match the required pattern. // -// * INVALID_ROLE_NAME: You provided a role name that is not valid. A role -// name can’t begin with the reserved prefix 'AWSServiceRoleFor'. +// * INVALID_ROLE_NAME: You provided a role name that isn't valid. A role +// name can't begin with the reserved prefix AWSServiceRoleFor. // -// * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid ARN for the -// organization. +// * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid Amazon Resource +// Name (ARN) for the organization. // // * INVALID_SYNTAX_POLICY_ID: You specified an invalid policy ID. // @@ -8368,7 +8401,7 @@ func (c *Organizations) ListTargetsForPolicyRequest(input *ListTargetsForPolicyI // in the IAM User Guide. // // * ErrCodeAWSOrganizationsNotInUseException "AWSOrganizationsNotInUseException" -// Your account is not a member of an organization. To make this request, you +// Your account isn't a member of an organization. To make this request, you // must use the credentials of an account that belongs to an organization. // // * ErrCodeInvalidInputException "InvalidInputException" @@ -8380,11 +8413,11 @@ func (c *Organizations) ListTargetsForPolicyRequest(input *ListTargetsForPolicyI // specific API or operation: // // * IMMUTABLE_POLICY: You specified a policy that is managed by AWS and -// cannot be modified. +// can't be modified. // // * INPUT_REQUIRED: You must include a value for all required parameters. // -// * INVALID_ENUM: You specified a value that is not valid for that parameter. +// * INVALID_ENUM: You specified a value that isn't valid for that parameter. // // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. @@ -8404,11 +8437,11 @@ func (c *Organizations) ListTargetsForPolicyRequest(input *ListTargetsForPolicyI // * INVALID_PATTERN_TARGET_ID: You specified a policy target ID that doesn't // match the required pattern. // -// * INVALID_ROLE_NAME: You provided a role name that is not valid. A role -// name can’t begin with the reserved prefix 'AWSServiceRoleFor'. +// * INVALID_ROLE_NAME: You provided a role name that isn't valid. A role +// name can't begin with the reserved prefix AWSServiceRoleFor. // -// * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid ARN for the -// organization. +// * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid Amazon Resource +// Name (ARN) for the organization. // // * INVALID_SYNTAX_POLICY_ID: You specified an invalid policy ID. // @@ -8588,11 +8621,11 @@ func (c *Organizations) MoveAccountRequest(input *MoveAccountInput) (req *reques // specific API or operation: // // * IMMUTABLE_POLICY: You specified a policy that is managed by AWS and -// cannot be modified. +// can't be modified. // // * INPUT_REQUIRED: You must include a value for all required parameters. // -// * INVALID_ENUM: You specified a value that is not valid for that parameter. +// * INVALID_ENUM: You specified a value that isn't valid for that parameter. // // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. @@ -8612,11 +8645,11 @@ func (c *Organizations) MoveAccountRequest(input *MoveAccountInput) (req *reques // * INVALID_PATTERN_TARGET_ID: You specified a policy target ID that doesn't // match the required pattern. // -// * INVALID_ROLE_NAME: You provided a role name that is not valid. A role -// name can’t begin with the reserved prefix 'AWSServiceRoleFor'. +// * INVALID_ROLE_NAME: You provided a role name that isn't valid. A role +// name can't begin with the reserved prefix AWSServiceRoleFor. // -// * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid ARN for the -// organization. +// * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid Amazon Resource +// Name (ARN) for the organization. // // * INVALID_SYNTAX_POLICY_ID: You specified an invalid policy ID. // @@ -8650,7 +8683,7 @@ func (c *Organizations) MoveAccountRequest(input *MoveAccountInput) (req *reques // // * ErrCodeAccountNotFoundException "AccountNotFoundException" // We can't find an AWS account with the AccountId that you specified, or the -// account whose credentials you used to make this request is not a member of +// account whose credentials you used to make this request isn't a member of // an organization. // // * ErrCodeTooManyRequestsException "TooManyRequestsException" @@ -8662,7 +8695,7 @@ func (c *Organizations) MoveAccountRequest(input *MoveAccountInput) (req *reques // Try again later. // // * ErrCodeAWSOrganizationsNotInUseException "AWSOrganizationsNotInUseException" -// Your account is not a member of an organization. To make this request, you +// Your account isn't a member of an organization. To make this request, you // must use the credentials of an account that belongs to an organization. // // * ErrCodeServiceException "ServiceException" @@ -8780,11 +8813,11 @@ func (c *Organizations) RemoveAccountFromOrganizationRequest(input *RemoveAccoun // // * ErrCodeAccountNotFoundException "AccountNotFoundException" // We can't find an AWS account with the AccountId that you specified, or the -// account whose credentials you used to make this request is not a member of +// account whose credentials you used to make this request isn't a member of // an organization. // // * ErrCodeAWSOrganizationsNotInUseException "AWSOrganizationsNotInUseException" -// Your account is not a member of an organization. To make this request, you +// Your account isn't a member of an organization. To make this request, you // must use the credentials of an account that belongs to an organization. // // * ErrCodeConcurrentModificationException "ConcurrentModificationException" @@ -8793,40 +8826,42 @@ func (c *Organizations) RemoveAccountFromOrganizationRequest(input *RemoveAccoun // // * ErrCodeConstraintViolationException "ConstraintViolationException" // Performing this operation violates a minimum or maximum value limit. For -// example, attempting to removing the last SCP from an OU or root, inviting -// or creating too many accounts to the organization, or attaching too many -// policies to an account, OU, or root. This exception includes a reason that -// contains additional information about the violated limit: +// example, attempting to removing the last service control policy (SCP) from +// an OU or root, inviting or creating too many accounts to the organization, +// or attaching too many policies to an account, OU, or root. This exception +// includes a reason that contains additional information about the violated +// limit. // // Some of the reasons in the following list might not be applicable to this // specific API or operation: // -// ACCOUNT_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the limit on the number -// of accounts in an organization. If you need more accounts, contact AWS Support -// to request an increase in your limit. +// * ACCOUNT_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the limit on +// the number of accounts in an organization. If you need more accounts, +// contactAWS Support (https://console.aws.amazon.com/support/home#/) to +// request an increase in your limit. // -// Or, The number of invitations that you tried to send would cause you to exceed -// the limit of accounts in your organization. Send fewer invitations, or contact -// AWS Support to request an increase in the number of accounts. +// Or the number of invitations that you tried to send would cause you to exceed +// the limit of accounts in your organization. Send fewer invitations or +// contact AWS Support to request an increase in the number of accounts. // -// Note: deleted and closed accounts still count toward your limit. +// Deleted and closed accounts still count toward your limit. // // If you get receive this exception when running a command immediately after -// creating the organization, wait one hour and try again. If after an hour -// it continues to fail with this error, contact AWS Customer Support (https://console.aws.amazon.com/support/home#/). +// creating the organization, wait one hour and try again. If after an hour +// it continues to fail with this error, contact AWS Support (https://console.aws.amazon.com/support/home#/). // // * HANDSHAKE_RATE_LIMIT_EXCEEDED: You attempted to exceed the number of -// handshakes you can send in one day. +// handshakes that you can send in one day. // -// * OU_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the number of organizational -// units you can have in an organization. +// * OU_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the number of OUs +// that you can have in an organization. // -// * OU_DEPTH_LIMIT_EXCEEDED: You attempted to create an organizational unit -// tree that is too many levels deep. +// * OU_DEPTH_LIMIT_EXCEEDED: You attempted to create an OU tree that is +// too many levels deep. // // * ORGANIZATION_NOT_IN_ALL_FEATURES_MODE: You attempted to perform an operation // that requires the organization to be configured to support all features. -// An organization that supports consolidated billing features only cannot +// An organization that supports only consolidated billing features can't // perform this operation. // // * POLICY_NUMBER_LIMIT_EXCEEDED. You attempted to exceed the number of @@ -8841,23 +8876,24 @@ func (c *Organizations) RemoveAccountFromOrganizationRequest(input *RemoveAccoun // minimum number of policies of a certain type required. // // * ACCOUNT_CANNOT_LEAVE_WITHOUT_EULA: You attempted to remove an account -// from the organization that does not yet have enough information to exist -// as a stand-alone account. This account requires you to first agree to -// the AWS Customer Agreement. Follow the steps at To leave an organization -// when all required account information has not yet been provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) +// from the organization that doesn't yet have enough information to exist +// as a standalone account. This account requires you to first agree to the +// AWS Customer Agreement. Follow the steps at To leave an organization when +// all required account information has not yet been provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) // in the AWS Organizations User Guide. // // * ACCOUNT_CANNOT_LEAVE_WITHOUT_PHONE_VERIFICATION: You attempted to remove -// an account from the organization that does not yet have enough information -// to exist as a stand-alone account. This account requires you to first -// complete phone verification. Follow the steps at To leave an organization -// when all required account information has not yet been provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) +// an account from the organization that doesn't yet have enough information +// to exist as a standalone account. This account requires you to first complete +// phone verification. Follow the steps at To leave an organization when +// all required account information has not yet been provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) // in the AWS Organizations User Guide. // // * MASTER_ACCOUNT_PAYMENT_INSTRUMENT_REQUIRED: To create an organization -// with this account, you first must associate a payment instrument, such -// as a credit card, with the account. Follow the steps at To leave an organization -// when all required account information has not yet been provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) +// with this master account, you first must associate a payment instrument, +// such as a credit card, with the account. Follow the steps at To leave +// an organization when all required account information has not yet been +// provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) // in the AWS Organizations User Guide. // // * MEMBER_ACCOUNT_PAYMENT_INSTRUMENT_REQUIRED: To complete this operation @@ -8890,11 +8926,11 @@ func (c *Organizations) RemoveAccountFromOrganizationRequest(input *RemoveAccoun // specific API or operation: // // * IMMUTABLE_POLICY: You specified a policy that is managed by AWS and -// cannot be modified. +// can't be modified. // // * INPUT_REQUIRED: You must include a value for all required parameters. // -// * INVALID_ENUM: You specified a value that is not valid for that parameter. +// * INVALID_ENUM: You specified a value that isn't valid for that parameter. // // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. @@ -8914,11 +8950,11 @@ func (c *Organizations) RemoveAccountFromOrganizationRequest(input *RemoveAccoun // * INVALID_PATTERN_TARGET_ID: You specified a policy target ID that doesn't // match the required pattern. // -// * INVALID_ROLE_NAME: You provided a role name that is not valid. A role -// name can’t begin with the reserved prefix 'AWSServiceRoleFor'. +// * INVALID_ROLE_NAME: You provided a role name that isn't valid. A role +// name can't begin with the reserved prefix AWSServiceRoleFor. // -// * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid ARN for the -// organization. +// * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid Amazon Resource +// Name (ARN) for the organization. // // * INVALID_SYNTAX_POLICY_ID: You specified an invalid policy ID. // @@ -9041,7 +9077,7 @@ func (c *Organizations) UpdateOrganizationalUnitRequest(input *UpdateOrganizatio // in the IAM User Guide. // // * ErrCodeAWSOrganizationsNotInUseException "AWSOrganizationsNotInUseException" -// Your account is not a member of an organization. To make this request, you +// Your account isn't a member of an organization. To make this request, you // must use the credentials of an account that belongs to an organization. // // * ErrCodeConcurrentModificationException "ConcurrentModificationException" @@ -9049,7 +9085,7 @@ func (c *Organizations) UpdateOrganizationalUnitRequest(input *UpdateOrganizatio // Try again later. // // * ErrCodeDuplicateOrganizationalUnitException "DuplicateOrganizationalUnitException" -// An organizational unit (OU) with the same name already exists. +// An OU with the same name already exists. // // * ErrCodeInvalidInputException "InvalidInputException" // The requested operation failed because you provided invalid values for one @@ -9060,11 +9096,11 @@ func (c *Organizations) UpdateOrganizationalUnitRequest(input *UpdateOrganizatio // specific API or operation: // // * IMMUTABLE_POLICY: You specified a policy that is managed by AWS and -// cannot be modified. +// can't be modified. // // * INPUT_REQUIRED: You must include a value for all required parameters. // -// * INVALID_ENUM: You specified a value that is not valid for that parameter. +// * INVALID_ENUM: You specified a value that isn't valid for that parameter. // // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. @@ -9084,11 +9120,11 @@ func (c *Organizations) UpdateOrganizationalUnitRequest(input *UpdateOrganizatio // * INVALID_PATTERN_TARGET_ID: You specified a policy target ID that doesn't // match the required pattern. // -// * INVALID_ROLE_NAME: You provided a role name that is not valid. A role -// name can’t begin with the reserved prefix 'AWSServiceRoleFor'. +// * INVALID_ROLE_NAME: You provided a role name that isn't valid. A role +// name can't begin with the reserved prefix AWSServiceRoleFor. // -// * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid ARN for the -// organization. +// * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid Amazon Resource +// Name (ARN) for the organization. // // * INVALID_SYNTAX_POLICY_ID: You specified an invalid policy ID. // @@ -9111,8 +9147,7 @@ func (c *Organizations) UpdateOrganizationalUnitRequest(input *UpdateOrganizatio // between entities in the same root. // // * ErrCodeOrganizationalUnitNotFoundException "OrganizationalUnitNotFoundException" -// We can't find an organizational unit (OU) with the OrganizationalUnitId that -// you specified. +// We can't find an OU with the OrganizationalUnitId that you specified. // // * ErrCodeServiceException "ServiceException" // AWS Organizations can't complete your request because of an internal service @@ -9210,7 +9245,7 @@ func (c *Organizations) UpdatePolicyRequest(input *UpdatePolicyInput) (req *requ // in the IAM User Guide. // // * ErrCodeAWSOrganizationsNotInUseException "AWSOrganizationsNotInUseException" -// Your account is not a member of an organization. To make this request, you +// Your account isn't a member of an organization. To make this request, you // must use the credentials of an account that belongs to an organization. // // * ErrCodeConcurrentModificationException "ConcurrentModificationException" @@ -9219,40 +9254,42 @@ func (c *Organizations) UpdatePolicyRequest(input *UpdatePolicyInput) (req *requ // // * ErrCodeConstraintViolationException "ConstraintViolationException" // Performing this operation violates a minimum or maximum value limit. For -// example, attempting to removing the last SCP from an OU or root, inviting -// or creating too many accounts to the organization, or attaching too many -// policies to an account, OU, or root. This exception includes a reason that -// contains additional information about the violated limit: +// example, attempting to removing the last service control policy (SCP) from +// an OU or root, inviting or creating too many accounts to the organization, +// or attaching too many policies to an account, OU, or root. This exception +// includes a reason that contains additional information about the violated +// limit. // // Some of the reasons in the following list might not be applicable to this // specific API or operation: // -// ACCOUNT_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the limit on the number -// of accounts in an organization. If you need more accounts, contact AWS Support -// to request an increase in your limit. +// * ACCOUNT_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the limit on +// the number of accounts in an organization. If you need more accounts, +// contactAWS Support (https://console.aws.amazon.com/support/home#/) to +// request an increase in your limit. // -// Or, The number of invitations that you tried to send would cause you to exceed -// the limit of accounts in your organization. Send fewer invitations, or contact -// AWS Support to request an increase in the number of accounts. +// Or the number of invitations that you tried to send would cause you to exceed +// the limit of accounts in your organization. Send fewer invitations or +// contact AWS Support to request an increase in the number of accounts. // -// Note: deleted and closed accounts still count toward your limit. +// Deleted and closed accounts still count toward your limit. // // If you get receive this exception when running a command immediately after -// creating the organization, wait one hour and try again. If after an hour -// it continues to fail with this error, contact AWS Customer Support (https://console.aws.amazon.com/support/home#/). +// creating the organization, wait one hour and try again. If after an hour +// it continues to fail with this error, contact AWS Support (https://console.aws.amazon.com/support/home#/). // // * HANDSHAKE_RATE_LIMIT_EXCEEDED: You attempted to exceed the number of -// handshakes you can send in one day. +// handshakes that you can send in one day. // -// * OU_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the number of organizational -// units you can have in an organization. +// * OU_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the number of OUs +// that you can have in an organization. // -// * OU_DEPTH_LIMIT_EXCEEDED: You attempted to create an organizational unit -// tree that is too many levels deep. +// * OU_DEPTH_LIMIT_EXCEEDED: You attempted to create an OU tree that is +// too many levels deep. // // * ORGANIZATION_NOT_IN_ALL_FEATURES_MODE: You attempted to perform an operation // that requires the organization to be configured to support all features. -// An organization that supports consolidated billing features only cannot +// An organization that supports only consolidated billing features can't // perform this operation. // // * POLICY_NUMBER_LIMIT_EXCEEDED. You attempted to exceed the number of @@ -9267,23 +9304,24 @@ func (c *Organizations) UpdatePolicyRequest(input *UpdatePolicyInput) (req *requ // minimum number of policies of a certain type required. // // * ACCOUNT_CANNOT_LEAVE_WITHOUT_EULA: You attempted to remove an account -// from the organization that does not yet have enough information to exist -// as a stand-alone account. This account requires you to first agree to -// the AWS Customer Agreement. Follow the steps at To leave an organization -// when all required account information has not yet been provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) +// from the organization that doesn't yet have enough information to exist +// as a standalone account. This account requires you to first agree to the +// AWS Customer Agreement. Follow the steps at To leave an organization when +// all required account information has not yet been provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) // in the AWS Organizations User Guide. // // * ACCOUNT_CANNOT_LEAVE_WITHOUT_PHONE_VERIFICATION: You attempted to remove -// an account from the organization that does not yet have enough information -// to exist as a stand-alone account. This account requires you to first -// complete phone verification. Follow the steps at To leave an organization -// when all required account information has not yet been provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) +// an account from the organization that doesn't yet have enough information +// to exist as a standalone account. This account requires you to first complete +// phone verification. Follow the steps at To leave an organization when +// all required account information has not yet been provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) // in the AWS Organizations User Guide. // // * MASTER_ACCOUNT_PAYMENT_INSTRUMENT_REQUIRED: To create an organization -// with this account, you first must associate a payment instrument, such -// as a credit card, with the account. Follow the steps at To leave an organization -// when all required account information has not yet been provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) +// with this master account, you first must associate a payment instrument, +// such as a credit card, with the account. Follow the steps at To leave +// an organization when all required account information has not yet been +// provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) // in the AWS Organizations User Guide. // // * MEMBER_ACCOUNT_PAYMENT_INSTRUMENT_REQUIRED: To complete this operation @@ -9319,11 +9357,11 @@ func (c *Organizations) UpdatePolicyRequest(input *UpdatePolicyInput) (req *requ // specific API or operation: // // * IMMUTABLE_POLICY: You specified a policy that is managed by AWS and -// cannot be modified. +// can't be modified. // // * INPUT_REQUIRED: You must include a value for all required parameters. // -// * INVALID_ENUM: You specified a value that is not valid for that parameter. +// * INVALID_ENUM: You specified a value that isn't valid for that parameter. // // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. @@ -9343,11 +9381,11 @@ func (c *Organizations) UpdatePolicyRequest(input *UpdatePolicyInput) (req *requ // * INVALID_PATTERN_TARGET_ID: You specified a policy target ID that doesn't // match the required pattern. // -// * INVALID_ROLE_NAME: You provided a role name that is not valid. A role -// name can’t begin with the reserved prefix 'AWSServiceRoleFor'. +// * INVALID_ROLE_NAME: You provided a role name that isn't valid. A role +// name can't begin with the reserved prefix AWSServiceRoleFor. // -// * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid ARN for the -// organization. +// * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid Amazon Resource +// Name (ARN) for the organization. // // * INVALID_SYNTAX_POLICY_ID: You specified an invalid policy ID. // @@ -9370,7 +9408,7 @@ func (c *Organizations) UpdatePolicyRequest(input *UpdatePolicyInput) (req *requ // between entities in the same root. // // * ErrCodeMalformedPolicyDocumentException "MalformedPolicyDocumentException" -// The provided policy document does not meet the requirements of the specified +// The provided policy document doesn't meet the requirements of the specified // policy type. For example, the syntax might be incorrect. For details about // service control policy syntax, see Service Control Policy Syntax (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_reference_scp-syntax.html) // in the AWS Organizations User Guide. @@ -9767,7 +9805,7 @@ type CreateAccountInput struct { // The email address of the owner to assign to the new member account. This // email address must not already be associated with another AWS account. You - // must use a valid email address to complete account creation. You cannot access + // must use a valid email address to complete account creation. You can't access // the root user of the account or remove an account that was created with an // invalid email address. // @@ -9775,25 +9813,26 @@ type CreateAccountInput struct { Email *string `min:"6" type:"string" required:"true"` // If set to ALLOW, the new account enables IAM users to access account billing - // information if they have the required permissions. If set to DENY, then only - // the root user of the new account can access account billing information. - // For more information, see Activating Access to the Billing and Cost Management + // information if they have the required permissions. If set to DENY, only the + // root user of the new account can access account billing information. For + // more information, see Activating Access to the Billing and Cost Management // Console (http://docs.aws.amazon.com/awsaccountbilling/latest/aboutv2/grantaccess.html#ControllingAccessWebsite-Activate) // in the AWS Billing and Cost Management User Guide. // - // If you do not specify this parameter, the value defaults to ALLOW, and IAM + // If you don't specify this parameter, the value defaults to ALLOW, and IAM // users and roles with the required permissions can access billing information // for the new account. IamUserAccessToBilling *string `type:"string" enum:"IAMUserAccessToBilling"` // (Optional) // - // The name of an IAM role that Organizations automatically preconfigures in - // the new member account. This role trusts the master account, allowing users - // in the master account to assume the role, as permitted by the master account - // administrator. The role has administrator permissions in the new member account. + // The name of an IAM role that AWS Organizations automatically preconfigures + // in the new member account. This role trusts the master account, allowing + // users in the master account to assume the role, as permitted by the master + // account administrator. The role has administrator permissions in the new + // member account. // - // If you do not specify this parameter, the role name defaults to OrganizationAccountAccessRole. + // If you don't specify this parameter, the role name defaults to OrganizationAccountAccessRole. // // For more information about how to use this role to access the member account, // see Accessing and Administering the Member Accounts in Your Organization @@ -9872,7 +9911,10 @@ type CreateAccountOutput struct { // This response structure might not be fully populated when you first receive // it because account creation is an asynchronous process. You can pass the // returned CreateAccountStatus ID as a parameter to DescribeCreateAccountStatus - // to get status about the progress of the request at later times. + // to get status about the progress of the request at later times. You can also + // check the AWS CloudTrail log for the CreateAccountResult event. For more + // information, see Monitoring the Activity in Your Organization (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_monitoring.html) + // in the AWS Organizations User Guide. CreateAccountStatus *CreateAccountStatus `type:"structure"` } @@ -11594,7 +11636,7 @@ type InviteAccountToOrganizationInput struct { // number as the Id. If you specify "Type": "EMAIL", then you must specify the // email address that is associated with the account. // - // --target Id=bill@example.com,Type=EMAIL + // --target Id=diego@example.com,Type=EMAIL // // Target is a required field Target *HandshakeParty `type:"structure" required:"true"` @@ -11695,15 +11737,15 @@ func (s LeaveOrganizationOutput) GoString() string { type ListAWSServiceAccessForOrganizationInput struct { _ struct{} `type:"structure"` - // (Optional) Use this to limit the number of results you want included in the - // response. If you do not include this parameter, it defaults to a value that - // is specific to the operation. If additional items exist beyond the maximum - // you specify, the NextToken response element is present and has a value (is - // not null). Include that value as the NextToken request parameter in the next - // call to the operation to get the next part of the results. Note that Organizations - // might return fewer results than the maximum even when there are more results - // available. You should check NextToken after every operation to ensure that - // you receive all of the results. + // (Optional) Use this to limit the number of results you want included per + // page in the response. If you do not include this parameter, it defaults to + // a value that is specific to the operation. If additional items exist beyond + // the maximum you specify, the NextToken response element is present and has + // a value (is not null). Include that value as the NextToken request parameter + // in the next call to the operation to get the next part of the results. Note + // that Organizations might return fewer results than the maximum even when + // there are more results available. You should check NextToken after every + // operation to ensure that you receive all of the results. MaxResults *int64 `min:"1" type:"integer"` // Use this parameter if you receive a NextToken response in a previous request @@ -11789,15 +11831,15 @@ func (s *ListAWSServiceAccessForOrganizationOutput) SetNextToken(v string) *List type ListAccountsForParentInput struct { _ struct{} `type:"structure"` - // (Optional) Use this to limit the number of results you want included in the - // response. If you do not include this parameter, it defaults to a value that - // is specific to the operation. If additional items exist beyond the maximum - // you specify, the NextToken response element is present and has a value (is - // not null). Include that value as the NextToken request parameter in the next - // call to the operation to get the next part of the results. Note that Organizations - // might return fewer results than the maximum even when there are more results - // available. You should check NextToken after every operation to ensure that - // you receive all of the results. + // (Optional) Use this to limit the number of results you want included per + // page in the response. If you do not include this parameter, it defaults to + // a value that is specific to the operation. If additional items exist beyond + // the maximum you specify, the NextToken response element is present and has + // a value (is not null). Include that value as the NextToken request parameter + // in the next call to the operation to get the next part of the results. Note + // that Organizations might return fewer results than the maximum even when + // there are more results available. You should check NextToken after every + // operation to ensure that you receive all of the results. MaxResults *int64 `min:"1" type:"integer"` // Use this parameter if you receive a NextToken response in a previous request @@ -11896,15 +11938,15 @@ func (s *ListAccountsForParentOutput) SetNextToken(v string) *ListAccountsForPar type ListAccountsInput struct { _ struct{} `type:"structure"` - // (Optional) Use this to limit the number of results you want included in the - // response. If you do not include this parameter, it defaults to a value that - // is specific to the operation. If additional items exist beyond the maximum - // you specify, the NextToken response element is present and has a value (is - // not null). Include that value as the NextToken request parameter in the next - // call to the operation to get the next part of the results. Note that Organizations - // might return fewer results than the maximum even when there are more results - // available. You should check NextToken after every operation to ensure that - // you receive all of the results. + // (Optional) Use this to limit the number of results you want included per + // page in the response. If you do not include this parameter, it defaults to + // a value that is specific to the operation. If additional items exist beyond + // the maximum you specify, the NextToken response element is present and has + // a value (is not null). Include that value as the NextToken request parameter + // in the next call to the operation to get the next part of the results. Note + // that Organizations might return fewer results than the maximum even when + // there are more results available. You should check NextToken after every + // operation to ensure that you receive all of the results. MaxResults *int64 `min:"1" type:"integer"` // Use this parameter if you receive a NextToken response in a previous request @@ -11993,15 +12035,15 @@ type ListChildrenInput struct { // ChildType is a required field ChildType *string `type:"string" required:"true" enum:"ChildType"` - // (Optional) Use this to limit the number of results you want included in the - // response. If you do not include this parameter, it defaults to a value that - // is specific to the operation. If additional items exist beyond the maximum - // you specify, the NextToken response element is present and has a value (is - // not null). Include that value as the NextToken request parameter in the next - // call to the operation to get the next part of the results. Note that Organizations - // might return fewer results than the maximum even when there are more results - // available. You should check NextToken after every operation to ensure that - // you receive all of the results. + // (Optional) Use this to limit the number of results you want included per + // page in the response. If you do not include this parameter, it defaults to + // a value that is specific to the operation. If additional items exist beyond + // the maximum you specify, the NextToken response element is present and has + // a value (is not null). Include that value as the NextToken request parameter + // in the next call to the operation to get the next part of the results. Note + // that Organizations might return fewer results than the maximum even when + // there are more results available. You should check NextToken after every + // operation to ensure that you receive all of the results. MaxResults *int64 `min:"1" type:"integer"` // Use this parameter if you receive a NextToken response in a previous request @@ -12120,15 +12162,15 @@ func (s *ListChildrenOutput) SetNextToken(v string) *ListChildrenOutput { type ListCreateAccountStatusInput struct { _ struct{} `type:"structure"` - // (Optional) Use this to limit the number of results you want included in the - // response. If you do not include this parameter, it defaults to a value that - // is specific to the operation. If additional items exist beyond the maximum - // you specify, the NextToken response element is present and has a value (is - // not null). Include that value as the NextToken request parameter in the next - // call to the operation to get the next part of the results. Note that Organizations - // might return fewer results than the maximum even when there are more results - // available. You should check NextToken after every operation to ensure that - // you receive all of the results. + // (Optional) Use this to limit the number of results you want included per + // page in the response. If you do not include this parameter, it defaults to + // a value that is specific to the operation. If additional items exist beyond + // the maximum you specify, the NextToken response element is present and has + // a value (is not null). Include that value as the NextToken request parameter + // in the next call to the operation to get the next part of the results. Note + // that Organizations might return fewer results than the maximum even when + // there are more results available. You should check NextToken after every + // operation to ensure that you receive all of the results. MaxResults *int64 `min:"1" type:"integer"` // Use this parameter if you receive a NextToken response in a previous request @@ -12232,15 +12274,15 @@ type ListHandshakesForAccountInput struct { // handshakes that were generated by that parent request. Filter *HandshakeFilter `type:"structure"` - // (Optional) Use this to limit the number of results you want included in the - // response. If you do not include this parameter, it defaults to a value that - // is specific to the operation. If additional items exist beyond the maximum - // you specify, the NextToken response element is present and has a value (is - // not null). Include that value as the NextToken request parameter in the next - // call to the operation to get the next part of the results. Note that Organizations - // might return fewer results than the maximum even when there are more results - // available. You should check NextToken after every operation to ensure that - // you receive all of the results. + // (Optional) Use this to limit the number of results you want included per + // page in the response. If you do not include this parameter, it defaults to + // a value that is specific to the operation. If additional items exist beyond + // the maximum you specify, the NextToken response element is present and has + // a value (is not null). Include that value as the NextToken request parameter + // in the next call to the operation to get the next part of the results. Note + // that Organizations might return fewer results than the maximum even when + // there are more results available. You should check NextToken after every + // operation to ensure that you receive all of the results. MaxResults *int64 `min:"1" type:"integer"` // Use this parameter if you receive a NextToken response in a previous request @@ -12339,15 +12381,15 @@ type ListHandshakesForOrganizationInput struct { // the handshakes that were generated by that parent request. Filter *HandshakeFilter `type:"structure"` - // (Optional) Use this to limit the number of results you want included in the - // response. If you do not include this parameter, it defaults to a value that - // is specific to the operation. If additional items exist beyond the maximum - // you specify, the NextToken response element is present and has a value (is - // not null). Include that value as the NextToken request parameter in the next - // call to the operation to get the next part of the results. Note that Organizations - // might return fewer results than the maximum even when there are more results - // available. You should check NextToken after every operation to ensure that - // you receive all of the results. + // (Optional) Use this to limit the number of results you want included per + // page in the response. If you do not include this parameter, it defaults to + // a value that is specific to the operation. If additional items exist beyond + // the maximum you specify, the NextToken response element is present and has + // a value (is not null). Include that value as the NextToken request parameter + // in the next call to the operation to get the next part of the results. Note + // that Organizations might return fewer results than the maximum even when + // there are more results available. You should check NextToken after every + // operation to ensure that you receive all of the results. MaxResults *int64 `min:"1" type:"integer"` // Use this parameter if you receive a NextToken response in a previous request @@ -12438,15 +12480,15 @@ func (s *ListHandshakesForOrganizationOutput) SetNextToken(v string) *ListHandsh type ListOrganizationalUnitsForParentInput struct { _ struct{} `type:"structure"` - // (Optional) Use this to limit the number of results you want included in the - // response. If you do not include this parameter, it defaults to a value that - // is specific to the operation. If additional items exist beyond the maximum - // you specify, the NextToken response element is present and has a value (is - // not null). Include that value as the NextToken request parameter in the next - // call to the operation to get the next part of the results. Note that Organizations - // might return fewer results than the maximum even when there are more results - // available. You should check NextToken after every operation to ensure that - // you receive all of the results. + // (Optional) Use this to limit the number of results you want included per + // page in the response. If you do not include this parameter, it defaults to + // a value that is specific to the operation. If additional items exist beyond + // the maximum you specify, the NextToken response element is present and has + // a value (is not null). Include that value as the NextToken request parameter + // in the next call to the operation to get the next part of the results. Note + // that Organizations might return fewer results than the maximum even when + // there are more results available. You should check NextToken after every + // operation to ensure that you receive all of the results. MaxResults *int64 `min:"1" type:"integer"` // Use this parameter if you receive a NextToken response in a previous request @@ -12572,15 +12614,15 @@ type ListParentsInput struct { // ChildId is a required field ChildId *string `type:"string" required:"true"` - // (Optional) Use this to limit the number of results you want included in the - // response. If you do not include this parameter, it defaults to a value that - // is specific to the operation. If additional items exist beyond the maximum - // you specify, the NextToken response element is present and has a value (is - // not null). Include that value as the NextToken request parameter in the next - // call to the operation to get the next part of the results. Note that Organizations - // might return fewer results than the maximum even when there are more results - // available. You should check NextToken after every operation to ensure that - // you receive all of the results. + // (Optional) Use this to limit the number of results you want included per + // page in the response. If you do not include this parameter, it defaults to + // a value that is specific to the operation. If additional items exist beyond + // the maximum you specify, the NextToken response element is present and has + // a value (is not null). Include that value as the NextToken request parameter + // in the next call to the operation to get the next part of the results. Note + // that Organizations might return fewer results than the maximum even when + // there are more results available. You should check NextToken after every + // operation to ensure that you receive all of the results. MaxResults *int64 `min:"1" type:"integer"` // Use this parameter if you receive a NextToken response in a previous request @@ -12678,15 +12720,15 @@ type ListPoliciesForTargetInput struct { // Filter is a required field Filter *string `type:"string" required:"true" enum:"PolicyType"` - // (Optional) Use this to limit the number of results you want included in the - // response. If you do not include this parameter, it defaults to a value that - // is specific to the operation. If additional items exist beyond the maximum - // you specify, the NextToken response element is present and has a value (is - // not null). Include that value as the NextToken request parameter in the next - // call to the operation to get the next part of the results. Note that Organizations - // might return fewer results than the maximum even when there are more results - // available. You should check NextToken after every operation to ensure that - // you receive all of the results. + // (Optional) Use this to limit the number of results you want included per + // page in the response. If you do not include this parameter, it defaults to + // a value that is specific to the operation. If additional items exist beyond + // the maximum you specify, the NextToken response element is present and has + // a value (is not null). Include that value as the NextToken request parameter + // in the next call to the operation to get the next part of the results. Note + // that Organizations might return fewer results than the maximum even when + // there are more results available. You should check NextToken after every + // operation to ensure that you receive all of the results. MaxResults *int64 `min:"1" type:"integer"` // Use this parameter if you receive a NextToken response in a previous request @@ -12812,15 +12854,15 @@ type ListPoliciesInput struct { // Filter is a required field Filter *string `type:"string" required:"true" enum:"PolicyType"` - // (Optional) Use this to limit the number of results you want included in the - // response. If you do not include this parameter, it defaults to a value that - // is specific to the operation. If additional items exist beyond the maximum - // you specify, the NextToken response element is present and has a value (is - // not null). Include that value as the NextToken request parameter in the next - // call to the operation to get the next part of the results. Note that Organizations - // might return fewer results than the maximum even when there are more results - // available. You should check NextToken after every operation to ensure that - // you receive all of the results. + // (Optional) Use this to limit the number of results you want included per + // page in the response. If you do not include this parameter, it defaults to + // a value that is specific to the operation. If additional items exist beyond + // the maximum you specify, the NextToken response element is present and has + // a value (is not null). Include that value as the NextToken request parameter + // in the next call to the operation to get the next part of the results. Note + // that Organizations might return fewer results than the maximum even when + // there are more results available. You should check NextToken after every + // operation to ensure that you receive all of the results. MaxResults *int64 `min:"1" type:"integer"` // Use this parameter if you receive a NextToken response in a previous request @@ -12915,15 +12957,15 @@ func (s *ListPoliciesOutput) SetPolicies(v []*PolicySummary) *ListPoliciesOutput type ListRootsInput struct { _ struct{} `type:"structure"` - // (Optional) Use this to limit the number of results you want included in the - // response. If you do not include this parameter, it defaults to a value that - // is specific to the operation. If additional items exist beyond the maximum - // you specify, the NextToken response element is present and has a value (is - // not null). Include that value as the NextToken request parameter in the next - // call to the operation to get the next part of the results. Note that Organizations - // might return fewer results than the maximum even when there are more results - // available. You should check NextToken after every operation to ensure that - // you receive all of the results. + // (Optional) Use this to limit the number of results you want included per + // page in the response. If you do not include this parameter, it defaults to + // a value that is specific to the operation. If additional items exist beyond + // the maximum you specify, the NextToken response element is present and has + // a value (is not null). Include that value as the NextToken request parameter + // in the next call to the operation to get the next part of the results. Note + // that Organizations might return fewer results than the maximum even when + // there are more results available. You should check NextToken after every + // operation to ensure that you receive all of the results. MaxResults *int64 `min:"1" type:"integer"` // Use this parameter if you receive a NextToken response in a previous request @@ -13007,15 +13049,15 @@ func (s *ListRootsOutput) SetRoots(v []*Root) *ListRootsOutput { type ListTargetsForPolicyInput struct { _ struct{} `type:"structure"` - // (Optional) Use this to limit the number of results you want included in the - // response. If you do not include this parameter, it defaults to a value that - // is specific to the operation. If additional items exist beyond the maximum - // you specify, the NextToken response element is present and has a value (is - // not null). Include that value as the NextToken request parameter in the next - // call to the operation to get the next part of the results. Note that Organizations - // might return fewer results than the maximum even when there are more results - // available. You should check NextToken after every operation to ensure that - // you receive all of the results. + // (Optional) Use this to limit the number of results you want included per + // page in the response. If you do not include this parameter, it defaults to + // a value that is specific to the operation. If additional items exist beyond + // the maximum you specify, the NextToken response element is present and has + // a value (is not null). Include that value as the NextToken request parameter + // in the next call to the operation to get the next part of the results. Note + // that Organizations might return fewer results than the maximum even when + // there are more results available. You should check NextToken after every + // operation to ensure that you receive all of the results. MaxResults *int64 `min:"1" type:"integer"` // Use this parameter if you receive a NextToken response in a previous request @@ -14067,6 +14109,12 @@ const ( // ConstraintViolationExceptionReasonOrganizationNotInAllFeaturesMode is a ConstraintViolationExceptionReason enum value ConstraintViolationExceptionReasonOrganizationNotInAllFeaturesMode = "ORGANIZATION_NOT_IN_ALL_FEATURES_MODE" + + // ConstraintViolationExceptionReasonEmailVerificationCodeExpired is a ConstraintViolationExceptionReason enum value + ConstraintViolationExceptionReasonEmailVerificationCodeExpired = "EMAIL_VERIFICATION_CODE_EXPIRED" + + // ConstraintViolationExceptionReasonWaitPeriodActive is a ConstraintViolationExceptionReason enum value + ConstraintViolationExceptionReasonWaitPeriodActive = "WAIT_PERIOD_ACTIVE" ) const ( diff --git a/vendor/github.com/aws/aws-sdk-go/service/organizations/errors.go b/vendor/github.com/aws/aws-sdk-go/service/organizations/errors.go index fe4011c056c..5d886170ef4 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/organizations/errors.go +++ b/vendor/github.com/aws/aws-sdk-go/service/organizations/errors.go @@ -7,7 +7,7 @@ const ( // ErrCodeAWSOrganizationsNotInUseException for service response error code // "AWSOrganizationsNotInUseException". // - // Your account is not a member of an organization. To make this request, you + // Your account isn't a member of an organization. To make this request, you // must use the credentials of an account that belongs to an organization. ErrCodeAWSOrganizationsNotInUseException = "AWSOrganizationsNotInUseException" @@ -24,19 +24,28 @@ const ( // ErrCodeAccessDeniedForDependencyException for service response error code // "AccessDeniedForDependencyException". // - // The operation you attempted requires you to have the iam:CreateServiceLinkedRole - // so that Organizations can create the required service-linked role. You do - // not have that permission. + // The operation that you attempted requires you to have the iam:CreateServiceLinkedRole + // so that AWS Organizations can create the required service-linked role. You + // don't have that permission. ErrCodeAccessDeniedForDependencyException = "AccessDeniedForDependencyException" // ErrCodeAccountNotFoundException for service response error code // "AccountNotFoundException". // // We can't find an AWS account with the AccountId that you specified, or the - // account whose credentials you used to make this request is not a member of + // account whose credentials you used to make this request isn't a member of // an organization. ErrCodeAccountNotFoundException = "AccountNotFoundException" + // ErrCodeAccountOwnerNotVerifiedException for service response error code + // "AccountOwnerNotVerifiedException". + // + // You can't invite an existing account to your organization until you verify + // that you own the email address associated with the master account. For more + // information, see Email Address Verification (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_create.html#about-email-verification) + // in the AWS Organizations User Guide. + ErrCodeAccountOwnerNotVerifiedException = "AccountOwnerNotVerifiedException" + // ErrCodeAlreadyInOrganizationException for service response error code // "AlreadyInOrganizationException". // @@ -62,40 +71,42 @@ const ( // "ConstraintViolationException". // // Performing this operation violates a minimum or maximum value limit. For - // example, attempting to removing the last SCP from an OU or root, inviting - // or creating too many accounts to the organization, or attaching too many - // policies to an account, OU, or root. This exception includes a reason that - // contains additional information about the violated limit: + // example, attempting to removing the last service control policy (SCP) from + // an OU or root, inviting or creating too many accounts to the organization, + // or attaching too many policies to an account, OU, or root. This exception + // includes a reason that contains additional information about the violated + // limit. // // Some of the reasons in the following list might not be applicable to this // specific API or operation: // - // ACCOUNT_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the limit on the number - // of accounts in an organization. If you need more accounts, contact AWS Support - // to request an increase in your limit. + // * ACCOUNT_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the limit on + // the number of accounts in an organization. If you need more accounts, + // contactAWS Support (https://console.aws.amazon.com/support/home#/) to + // request an increase in your limit. // - // Or, The number of invitations that you tried to send would cause you to exceed - // the limit of accounts in your organization. Send fewer invitations, or contact - // AWS Support to request an increase in the number of accounts. + // Or the number of invitations that you tried to send would cause you to exceed + // the limit of accounts in your organization. Send fewer invitations or + // contact AWS Support to request an increase in the number of accounts. // - // Note: deleted and closed accounts still count toward your limit. + // Deleted and closed accounts still count toward your limit. // // If you get receive this exception when running a command immediately after - // creating the organization, wait one hour and try again. If after an hour - // it continues to fail with this error, contact AWS Customer Support (https://console.aws.amazon.com/support/home#/). + // creating the organization, wait one hour and try again. If after an hour + // it continues to fail with this error, contact AWS Support (https://console.aws.amazon.com/support/home#/). // // * HANDSHAKE_RATE_LIMIT_EXCEEDED: You attempted to exceed the number of - // handshakes you can send in one day. + // handshakes that you can send in one day. // - // * OU_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the number of organizational - // units you can have in an organization. + // * OU_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the number of OUs + // that you can have in an organization. // - // * OU_DEPTH_LIMIT_EXCEEDED: You attempted to create an organizational unit - // tree that is too many levels deep. + // * OU_DEPTH_LIMIT_EXCEEDED: You attempted to create an OU tree that is + // too many levels deep. // // * ORGANIZATION_NOT_IN_ALL_FEATURES_MODE: You attempted to perform an operation // that requires the organization to be configured to support all features. - // An organization that supports consolidated billing features only cannot + // An organization that supports only consolidated billing features can't // perform this operation. // // * POLICY_NUMBER_LIMIT_EXCEEDED. You attempted to exceed the number of @@ -110,23 +121,24 @@ const ( // minimum number of policies of a certain type required. // // * ACCOUNT_CANNOT_LEAVE_WITHOUT_EULA: You attempted to remove an account - // from the organization that does not yet have enough information to exist - // as a stand-alone account. This account requires you to first agree to - // the AWS Customer Agreement. Follow the steps at To leave an organization - // when all required account information has not yet been provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) + // from the organization that doesn't yet have enough information to exist + // as a standalone account. This account requires you to first agree to the + // AWS Customer Agreement. Follow the steps at To leave an organization when + // all required account information has not yet been provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) // in the AWS Organizations User Guide. // // * ACCOUNT_CANNOT_LEAVE_WITHOUT_PHONE_VERIFICATION: You attempted to remove - // an account from the organization that does not yet have enough information - // to exist as a stand-alone account. This account requires you to first - // complete phone verification. Follow the steps at To leave an organization - // when all required account information has not yet been provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) + // an account from the organization that doesn't yet have enough information + // to exist as a standalone account. This account requires you to first complete + // phone verification. Follow the steps at To leave an organization when + // all required account information has not yet been provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) // in the AWS Organizations User Guide. // // * MASTER_ACCOUNT_PAYMENT_INSTRUMENT_REQUIRED: To create an organization - // with this account, you first must associate a payment instrument, such - // as a credit card, with the account. Follow the steps at To leave an organization - // when all required account information has not yet been provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) + // with this master account, you first must associate a payment instrument, + // such as a credit card, with the account. Follow the steps at To leave + // an organization when all required account information has not yet been + // provided (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info) // in the AWS Organizations User Guide. // // * MEMBER_ACCOUNT_PAYMENT_INSTRUMENT_REQUIRED: To complete this operation @@ -184,7 +196,7 @@ const ( // ErrCodeDuplicateOrganizationalUnitException for service response error code // "DuplicateOrganizationalUnitException". // - // An organizational unit (OU) with the same name already exists. + // An OU with the same name already exists. ErrCodeDuplicateOrganizationalUnitException = "DuplicateOrganizationalUnitException" // ErrCodeDuplicatePolicyAttachmentException for service response error code @@ -202,10 +214,10 @@ const ( // ErrCodeFinalizingOrganizationException for service response error code // "FinalizingOrganizationException". // - // AWS Organizations could not perform the operation because your organization - // has not finished initializing. This can take up to an hour. Try again later. - // If after one hour you continue to receive this error, contact AWS Customer - // Support (https://console.aws.amazon.com/support/home#/). + // AWS Organizations couldn't perform the operation because your organization + // hasn't finished initializing. This can take up to an hour. Try again later. + // If after one hour you continue to receive this error, contact AWS Support + // (https://console.aws.amazon.com/support/home#/). ErrCodeFinalizingOrganizationException = "FinalizingOrganizationException" // ErrCodeHandshakeAlreadyInStateException for service response error code @@ -225,15 +237,15 @@ const ( // specific API or operation: // // * ACCOUNT_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the limit on - // the number of accounts in an organization. Note: deleted and closed accounts - // still count toward your limit. + // the number of accounts in an organization. Note that deleted and closed + // accounts still count toward your limit. // // If you get this exception immediately after creating the organization, wait // one hour and try again. If after an hour it continues to fail with this - // error, contact AWS Customer Support (https://console.aws.amazon.com/support/home#/). + // error, contact AWS Support (https://console.aws.amazon.com/support/home#/). // // * HANDSHAKE_RATE_LIMIT_EXCEEDED: You attempted to exceed the number of - // handshakes you can send in one day. + // handshakes that you can send in one day. // // * ALREADY_IN_AN_ORGANIZATION: The handshake request is invalid because // the invited account is already a member of an organization. @@ -241,13 +253,13 @@ const ( // * ORGANIZATION_ALREADY_HAS_ALL_FEATURES: The handshake request is invalid // because the organization has already enabled all features. // - // * INVITE_DISABLED_DURING_ENABLE_ALL_FEATURES: You cannot issue new invitations - // to join an organization while it is in the process of enabling all features. + // * INVITE_DISABLED_DURING_ENABLE_ALL_FEATURES: You can't issue new invitations + // to join an organization while it's in the process of enabling all features. // You can resume inviting accounts after you finalize the process when all // accounts have agreed to the change. // - // * PAYMENT_INSTRUMENT_REQUIRED: You cannot complete the operation with - // an account that does not have a payment instrument, such as a credit card, + // * PAYMENT_INSTRUMENT_REQUIRED: You can't complete the operation with an + // account that doesn't have a payment instrument, such as a credit card, // associated with it. // // * ORGANIZATION_FROM_DIFFERENT_SELLER_OF_RECORD: The request failed because @@ -270,7 +282,7 @@ const ( // "InvalidHandshakeTransitionException". // // You can't perform the operation on the handshake in its current state. For - // example, you can't cancel a handshake that was already accepted, or accept + // example, you can't cancel a handshake that was already accepted or accept // a handshake that was already declined. ErrCodeInvalidHandshakeTransitionException = "InvalidHandshakeTransitionException" @@ -285,11 +297,11 @@ const ( // specific API or operation: // // * IMMUTABLE_POLICY: You specified a policy that is managed by AWS and - // cannot be modified. + // can't be modified. // // * INPUT_REQUIRED: You must include a value for all required parameters. // - // * INVALID_ENUM: You specified a value that is not valid for that parameter. + // * INVALID_ENUM: You specified a value that isn't valid for that parameter. // // * INVALID_FULL_NAME_TARGET: You specified a full name that contains invalid // characters. @@ -309,11 +321,11 @@ const ( // * INVALID_PATTERN_TARGET_ID: You specified a policy target ID that doesn't // match the required pattern. // - // * INVALID_ROLE_NAME: You provided a role name that is not valid. A role - // name can’t begin with the reserved prefix 'AWSServiceRoleFor'. + // * INVALID_ROLE_NAME: You provided a role name that isn't valid. A role + // name can't begin with the reserved prefix AWSServiceRoleFor. // - // * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid ARN for the - // organization. + // * INVALID_SYNTAX_ORGANIZATION_ARN: You specified an invalid Amazon Resource + // Name (ARN) for the organization. // // * INVALID_SYNTAX_POLICY_ID: You specified an invalid policy ID. // @@ -339,7 +351,7 @@ const ( // ErrCodeMalformedPolicyDocumentException for service response error code // "MalformedPolicyDocumentException". // - // The provided policy document does not meet the requirements of the specified + // The provided policy document doesn't meet the requirements of the specified // policy type. For example, the syntax might be incorrect. For details about // service control policy syntax, see Service Control Policy Syntax (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_reference_scp-syntax.html) // in the AWS Organizations User Guide. @@ -357,37 +369,33 @@ const ( // "OrganizationNotEmptyException". // // The organization isn't empty. To delete an organization, you must first remove - // all accounts except the master account, delete all organizational units (OUs), - // and delete all policies. + // all accounts except the master account, delete all OUs, and delete all policies. ErrCodeOrganizationNotEmptyException = "OrganizationNotEmptyException" // ErrCodeOrganizationalUnitNotEmptyException for service response error code // "OrganizationalUnitNotEmptyException". // - // The specified organizational unit (OU) is not empty. Move all accounts to - // another root or to other OUs, remove all child OUs, and then try the operation - // again. + // The specified OU is not empty. Move all accounts to another root or to other + // OUs, remove all child OUs, and try the operation again. ErrCodeOrganizationalUnitNotEmptyException = "OrganizationalUnitNotEmptyException" // ErrCodeOrganizationalUnitNotFoundException for service response error code // "OrganizationalUnitNotFoundException". // - // We can't find an organizational unit (OU) with the OrganizationalUnitId that - // you specified. + // We can't find an OU with the OrganizationalUnitId that you specified. ErrCodeOrganizationalUnitNotFoundException = "OrganizationalUnitNotFoundException" // ErrCodeParentNotFoundException for service response error code // "ParentNotFoundException". // - // We can't find a root or organizational unit (OU) with the ParentId that you - // specified. + // We can't find a root or OU with the ParentId that you specified. ErrCodeParentNotFoundException = "ParentNotFoundException" // ErrCodePolicyInUseException for service response error code // "PolicyInUseException". // // The policy is attached to one or more entities. You must detach it from all - // roots, organizational units (OUs), and accounts before performing this operation. + // roots, OUs, and accounts before performing this operation. ErrCodePolicyInUseException = "PolicyInUseException" // ErrCodePolicyNotAttachedException for service response error code @@ -412,16 +420,16 @@ const ( // "PolicyTypeNotAvailableForOrganizationException". // // You can't use the specified policy type with the feature set currently enabled - // for this organization. For example, you can enable service control policies - // (SCPs) only after you enable all features in the organization. For more information, - // see Enabling and Disabling a Policy Type on a Root (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_policies.html#enable_policies_on_root) + // for this organization. For example, you can enable SCPs only after you enable + // all features in the organization. For more information, see Enabling and + // Disabling a Policy Type on a Root (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_policies.html#enable_policies_on_root) // in the AWS Organizations User Guide. ErrCodePolicyTypeNotAvailableForOrganizationException = "PolicyTypeNotAvailableForOrganizationException" // ErrCodePolicyTypeNotEnabledException for service response error code // "PolicyTypeNotEnabledException". // - // The specified policy type is not currently enabled in this root. You cannot + // The specified policy type isn't currently enabled in this root. You can't // attach policies of the specified type to entities in a root until you enable // that type in the root. For more information, see Enabling All Features in // Your Organization (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_org_support-all-features.html) diff --git a/vendor/github.com/aws/aws-sdk-go/service/s3/api.go b/vendor/github.com/aws/aws-sdk-go/service/s3/api.go index 0279d92d9d9..10436195009 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/s3/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/s3/api.go @@ -5403,7 +5403,8 @@ func (c *S3) PutBucketReplicationRequest(input *PutBucketReplicationInput) (req // PutBucketReplication API operation for Amazon Simple Storage Service. // // Creates a new replication configuration (or replaces an existing one, if -// present). +// present). For more information, see Cross-Region Replication (CRR) ( https://docs.aws.amazon.com/AmazonS3/latest/dev/crr.html) +// in the Amazon S3 Developer Guide. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about @@ -9280,6 +9281,14 @@ func (s DeleteBucketPolicyOutput) GoString() string { type DeleteBucketReplicationInput struct { _ struct{} `type:"structure"` + // Deletes the replication subresource associated with the specified bucket. + // + // There is usually some time lag before replication configuration deletion + // is fully propagated to all the Amazon S3 systems. + // + // For more information, see Cross-Region Replication (CRR) ( https://docs.aws.amazon.com/AmazonS3/latest/dev/crr.html) + // in the Amazon S3 Developer Guide. + // // Bucket is a required field Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"` } @@ -9507,6 +9516,33 @@ func (s *DeleteMarkerEntry) SetVersionId(v string) *DeleteMarkerEntry { return s } +// Specifies whether Amazon S3 should replicate delete makers. +type DeleteMarkerReplication struct { + _ struct{} `type:"structure"` + + // The status of the delete marker replication. + // + // In the current implementation, Amazon S3 does not replicate the delete markers. + // Therefore, the status must be Disabled. + Status *string `type:"string" enum:"DeleteMarkerReplicationStatus"` +} + +// String returns the string representation +func (s DeleteMarkerReplication) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DeleteMarkerReplication) GoString() string { + return s.String() +} + +// SetStatus sets the Status field's value. +func (s *DeleteMarkerReplication) SetStatus(v string) *DeleteMarkerReplication { + s.Status = &v + return s +} + type DeleteObjectInput struct { _ struct{} `type:"structure"` @@ -9903,19 +9939,34 @@ type Destination struct { _ struct{} `type:"structure"` // Container for information regarding the access control for replicas. + // + // Use only in a cross-account scenario, where source and destination bucket + // owners are not the same, when you want to change replica ownership to the + // AWS account that owns the destination bucket. If you don't add this element + // to the replication configuration, the replicas are owned by same AWS account + // that owns the source object. AccessControlTranslation *AccessControlTranslation `type:"structure"` - // Account ID of the destination bucket. Currently this is only being verified - // if Access Control Translation is enabled + // Account ID of the destination bucket. Currently Amazon S3 verifies this value + // only if Access Control Translation is enabled. + // + // In a cross-account scenario, if you tell Amazon S3 to change replica ownership + // to the AWS account that owns the destination bucket by adding the AccessControlTranslation + // element, this is the account ID of the destination bucket owner. Account *string `type:"string"` // Amazon resource name (ARN) of the bucket where you want Amazon S3 to store // replicas of the object identified by the rule. // + // If you have multiple rules in your replication configuration, all rules must + // specify the same bucket as the destination. A replication configuration can + // replicate objects only to one destination bucket. + // // Bucket is a required field Bucket *string `type:"string" required:"true"` - // Container for information regarding encryption based configuration for replicas. + // Container that provides encryption-related information. You must specify + // this element if the SourceSelectionCriteria is specified. EncryptionConfiguration *EncryptionConfiguration `type:"structure"` // The class of storage used to store the object. @@ -10052,7 +10103,8 @@ func (s *Encryption) SetKMSKeyId(v string) *Encryption { type EncryptionConfiguration struct { _ struct{} `type:"structure"` - // The id of the KMS key used to encrypt the replica object. + // The ID of the AWS KMS key for the region where the destination bucket resides. + // Amazon S3 uses this key to encrypt the replica object. ReplicaKmsKeyID *string `type:"string"` } @@ -19081,8 +19133,8 @@ type ReplicationConfiguration struct { // Role is a required field Role *string `type:"string" required:"true"` - // Container for information about a particular replication rule. Replication - // configuration must have at least one rule and can contain up to 1,000 rules. + // Container for one or more replication rules. Replication configuration must + // have at least one rule and can contain up to 1,000 rules. // // Rules is a required field Rules []*ReplicationRule `locationName:"Rule" type:"list" flattened:"true" required:"true"` @@ -19140,22 +19192,50 @@ func (s *ReplicationConfiguration) SetRules(v []*ReplicationRule) *ReplicationCo type ReplicationRule struct { _ struct{} `type:"structure"` + // Specifies whether Amazon S3 should replicate delete makers. + DeleteMarkerReplication *DeleteMarkerReplication `type:"structure"` + // Container for replication destination information. // // Destination is a required field Destination *Destination `type:"structure" required:"true"` + // Filter that identifies subset of objects to which the replication rule applies. + // A Filter must specify exactly one Prefix, Tag, or an And child element. + Filter *ReplicationRuleFilter `type:"structure"` + // Unique identifier for the rule. The value cannot be longer than 255 characters. ID *string `type:"string"` // Object keyname prefix identifying one or more objects to which the rule applies. - // Maximum prefix length can be up to 1,024 characters. Overlapping prefixes - // are not supported. + // Maximum prefix length can be up to 1,024 characters. // - // Prefix is a required field - Prefix *string `type:"string" required:"true"` + // Deprecated: Prefix has been deprecated + Prefix *string `deprecated:"true" type:"string"` - // Container for filters that define which source objects should be replicated. + // The priority associated with the rule. If you specify multiple rules in a + // replication configuration, then Amazon S3 applies rule priority in the event + // there are conflicts (two or more rules identify the same object based on + // filter specified). The rule with higher priority takes precedence. For example, + // + // * Same object quality prefix based filter criteria If prefixes you specified + // in multiple rules overlap. + // + // * Same object qualify tag based filter criteria specified in multiple + // rules + // + // For more information, see Cross-Region Replication (CRR) ( https://docs.aws.amazon.com/AmazonS3/latest/dev/crr.html) + // in the Amazon S3 Developer Guide. + Priority *int64 `type:"integer"` + + // Container that describes additional filters in identifying source objects + // that you want to replicate. Currently, Amazon S3 supports only the filter + // that you can specify for objects created with server-side encryption using + // an AWS KMS-managed key. You can choose to enable or disable replication of + // these objects. + // + // if you want Amazon S3 to replicate objects created with server-side encryption + // using AWS KMS-managed keys. SourceSelectionCriteria *SourceSelectionCriteria `type:"structure"` // The rule is ignored if status is not Enabled. @@ -19180,9 +19260,6 @@ func (s *ReplicationRule) Validate() error { if s.Destination == nil { invalidParams.Add(request.NewErrParamRequired("Destination")) } - if s.Prefix == nil { - invalidParams.Add(request.NewErrParamRequired("Prefix")) - } if s.Status == nil { invalidParams.Add(request.NewErrParamRequired("Status")) } @@ -19191,6 +19268,11 @@ func (s *ReplicationRule) Validate() error { invalidParams.AddNested("Destination", err.(request.ErrInvalidParams)) } } + if s.Filter != nil { + if err := s.Filter.Validate(); err != nil { + invalidParams.AddNested("Filter", err.(request.ErrInvalidParams)) + } + } if s.SourceSelectionCriteria != nil { if err := s.SourceSelectionCriteria.Validate(); err != nil { invalidParams.AddNested("SourceSelectionCriteria", err.(request.ErrInvalidParams)) @@ -19203,12 +19285,24 @@ func (s *ReplicationRule) Validate() error { return nil } +// SetDeleteMarkerReplication sets the DeleteMarkerReplication field's value. +func (s *ReplicationRule) SetDeleteMarkerReplication(v *DeleteMarkerReplication) *ReplicationRule { + s.DeleteMarkerReplication = v + return s +} + // SetDestination sets the Destination field's value. func (s *ReplicationRule) SetDestination(v *Destination) *ReplicationRule { s.Destination = v return s } +// SetFilter sets the Filter field's value. +func (s *ReplicationRule) SetFilter(v *ReplicationRuleFilter) *ReplicationRule { + s.Filter = v + return s +} + // SetID sets the ID field's value. func (s *ReplicationRule) SetID(v string) *ReplicationRule { s.ID = &v @@ -19221,6 +19315,12 @@ func (s *ReplicationRule) SetPrefix(v string) *ReplicationRule { return s } +// SetPriority sets the Priority field's value. +func (s *ReplicationRule) SetPriority(v int64) *ReplicationRule { + s.Priority = &v + return s +} + // SetSourceSelectionCriteria sets the SourceSelectionCriteria field's value. func (s *ReplicationRule) SetSourceSelectionCriteria(v *SourceSelectionCriteria) *ReplicationRule { s.SourceSelectionCriteria = v @@ -19233,6 +19333,130 @@ func (s *ReplicationRule) SetStatus(v string) *ReplicationRule { return s } +type ReplicationRuleAndOperator struct { + _ struct{} `type:"structure"` + + Prefix *string `type:"string"` + + Tags []*Tag `locationName:"Tag" locationNameList:"Tag" type:"list" flattened:"true"` +} + +// String returns the string representation +func (s ReplicationRuleAndOperator) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s ReplicationRuleAndOperator) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *ReplicationRuleAndOperator) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "ReplicationRuleAndOperator"} + if s.Tags != nil { + for i, v := range s.Tags { + if v == nil { + continue + } + if err := v.Validate(); err != nil { + invalidParams.AddNested(fmt.Sprintf("%s[%v]", "Tags", i), err.(request.ErrInvalidParams)) + } + } + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetPrefix sets the Prefix field's value. +func (s *ReplicationRuleAndOperator) SetPrefix(v string) *ReplicationRuleAndOperator { + s.Prefix = &v + return s +} + +// SetTags sets the Tags field's value. +func (s *ReplicationRuleAndOperator) SetTags(v []*Tag) *ReplicationRuleAndOperator { + s.Tags = v + return s +} + +// Filter that identifies subset of objects to which the replication rule applies. +// A Filter must specify exactly one Prefix, Tag, or an And child element. +type ReplicationRuleFilter struct { + _ struct{} `type:"structure"` + + // Container for specifying rule filters. These filters determine the subset + // of objects to which the rule applies. The element is required only if you + // specify more than one filter. For example: + // + // * You specify both a Prefix and a Tag filters. Then you wrap these in + // an And tag. + // + // * You specify filter based on multiple tags. Then you wrap the Tag elements + // in an And tag. + And *ReplicationRuleAndOperator `type:"structure"` + + // Object keyname prefix that identifies subset of objects to which the rule + // applies. + Prefix *string `type:"string"` + + // Container for specifying a tag key and value. + // + // The rule applies only to objects having the tag in its tagset. + Tag *Tag `type:"structure"` +} + +// String returns the string representation +func (s ReplicationRuleFilter) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s ReplicationRuleFilter) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *ReplicationRuleFilter) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "ReplicationRuleFilter"} + if s.And != nil { + if err := s.And.Validate(); err != nil { + invalidParams.AddNested("And", err.(request.ErrInvalidParams)) + } + } + if s.Tag != nil { + if err := s.Tag.Validate(); err != nil { + invalidParams.AddNested("Tag", err.(request.ErrInvalidParams)) + } + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetAnd sets the And field's value. +func (s *ReplicationRuleFilter) SetAnd(v *ReplicationRuleAndOperator) *ReplicationRuleFilter { + s.And = v + return s +} + +// SetPrefix sets the Prefix field's value. +func (s *ReplicationRuleFilter) SetPrefix(v string) *ReplicationRuleFilter { + s.Prefix = &v + return s +} + +// SetTag sets the Tag field's value. +func (s *ReplicationRuleFilter) SetTag(v *Tag) *ReplicationRuleFilter { + s.Tag = v + return s +} + type RequestPaymentConfiguration struct { _ struct{} `type:"structure"` @@ -20411,6 +20635,8 @@ type SourceSelectionCriteria struct { _ struct{} `type:"structure"` // Container for filter information of selection of KMS Encrypted S3 objects. + // The element is required if you include SourceSelectionCriteria in the replication + // configuration. SseKmsEncryptedObjects *SseKmsEncryptedObjects `type:"structure"` } @@ -21760,6 +21986,14 @@ const ( CompressionTypeBzip2 = "BZIP2" ) +const ( + // DeleteMarkerReplicationStatusEnabled is a DeleteMarkerReplicationStatus enum value + DeleteMarkerReplicationStatusEnabled = "Enabled" + + // DeleteMarkerReplicationStatusDisabled is a DeleteMarkerReplicationStatus enum value + DeleteMarkerReplicationStatusDisabled = "Disabled" +) + // Requests Amazon S3 to encode the object keys in the response and specifies // the encoding method to use. An object key may contain any Unicode character; // however, XML 1.0 parser cannot parse some characters, such as characters diff --git a/vendor/github.com/aws/aws-sdk-go/service/secretsmanager/api.go b/vendor/github.com/aws/aws-sdk-go/service/secretsmanager/api.go index 9060cef94bb..78163a2b7a1 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/secretsmanager/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/secretsmanager/api.go @@ -5098,23 +5098,19 @@ type UpdateSecretVersionStageInput struct { _ struct{} `type:"structure"` // (Optional) The secret version ID that you want to add the staging labels - // to. + // to. If you want to remove a label from a version, then do not specify this + // parameter. // // If any of the staging labels are already attached to a different version - // of the secret, then they are automatically removed from that version before - // adding them to this version. + // of the secret, then you must also specify the RemoveFromVersionId parameter. MoveToVersionId *string `min:"32" type:"string"` - // (Optional) Specifies the secret version ID of the version that the staging - // labels are to be removed from. - // - // If you want to move a label to a new version, you do not have to explicitly - // remove it with this parameter. Adding a label using the MoveToVersionId parameter - // automatically removes it from the old version. However, if you do include - // both the "MoveTo" and "RemoveFrom" parameters, then the move is successful - // only if the staging labels are actually present on the "RemoveFrom" version. - // If a staging label was on a different version than "RemoveFrom", then the - // request fails. + // Specifies the secret version ID of the version that the staging labels are + // to be removed from. If the staging label you are trying to attach to one + // version is already attached to a different version, then you must include + // this parameter and specify the version that the label is to be removed from. + // If the label is attached and you either do not specify this parameter, or + // the version ID does not match, then the operation fails. RemoveFromVersionId *string `min:"32" type:"string"` // Specifies the secret with the version whose list of staging labels you want diff --git a/vendor/github.com/aws/aws-sdk-go/service/ses/api.go b/vendor/github.com/aws/aws-sdk-go/service/ses/api.go index f93a8b73290..c18664b354d 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/ses/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/ses/api.go @@ -4046,8 +4046,7 @@ func (c *SES) SendBulkTemplatedEmailRequest(input *SendBulkTemplatedEmailInput) // Email Addresses and Domains (http://docs.aws.amazon.com/ses/latest/DeveloperGuide/verify-addresses-and-domains.html) // in the Amazon SES Developer Guide. // -// * The total size of the message, including attachments, must be less than -// 10 MB. +// * The maximum message size is 10 MB. // // * Each Destination parameter must include at least one recipient email // address. The recipient address can be a To: address, a CC: address, or @@ -4056,6 +4055,15 @@ func (c *SES) SendBulkTemplatedEmailRequest(input *SendBulkTemplatedEmailInput) // message will be rejected, even if the message contains other recipients // that are valid. // +// * The message may not include more than 50 recipients, across the To:, +// CC: and BCC: fields. If you need to send an email message to a larger +// audience, you can divide your recipient list into groups of 50 or fewer, +// and then call the SendBulkTemplatedEmail operation several times to send +// the message to each group. +// +// * The number of destinations you can contact in a single call to the API +// may be limited by your account's maximum sending rate. +// // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about // the error. @@ -4277,8 +4285,7 @@ func (c *SES) SendEmailRequest(input *SendEmailInput) (req *request.Request, out // Email Addresses and Domains (http://docs.aws.amazon.com/ses/latest/DeveloperGuide/verify-addresses-and-domains.html) // in the Amazon SES Developer Guide. // -// * The total size of the message, including attachments, must be smaller -// than 10 MB. +// * The maximum message size is 10 MB. // // * The message must include at least one recipient email address. The recipient // address can be a To: address, a CC: address, or a BCC: address. If a recipient @@ -4397,45 +4404,49 @@ func (c *SES) SendRawEmailRequest(input *SendRawEmailInput) (req *request.Reques // SendRawEmail API operation for Amazon Simple Email Service. // -// Composes an email message and immediately queues it for sending. When calling -// this operation, you may specify the message headers as well as the content. -// The SendRawEmail operation is particularly useful for sending multipart MIME -// emails (such as those that contain both a plain-text and an HTML version). +// Composes an email message and immediately queues it for sending. // -// In order to send email using the SendRawEmail operation, your message must -// meet the following requirements: +// This operation is more flexible than the SendEmail API operation. When you +// use the SendRawEmail operation, you can specify the headers of the message +// as well as its content. This flexibility is useful, for example, when you +// want to send a multipart MIME email (such a message that contains both a +// text and an HTML version). You can also use this operation to send messages +// that include attachments. // -// * The message must be sent from a verified email address or domain. If -// you attempt to send email using a non-verified address or domain, the -// operation will result in an "Email address not verified" error. +// The SendRawEmail operation has the following requirements: // -// * If your account is still in the Amazon SES sandbox, you may only send -// to verified addresses or domains, or to email addresses associated with -// the Amazon SES Mailbox Simulator. For more information, see Verifying -// Email Addresses and Domains (http://docs.aws.amazon.com/ses/latest/DeveloperGuide/verify-addresses-and-domains.html) -// in the Amazon SES Developer Guide. +// * You can only send email from verified email addresses or domains (http://docs.aws.amazon.com/ses/latest/DeveloperGuide/verify-addresses-and-domains.html). +// If you try to send email from an address that isn't verified, the operation +// results in an "Email address not verified" error. // -// * The total size of the message, including attachments, must be smaller -// than 10 MB. +// * If your account is still in the Amazon SES sandbox (http://docs.aws.amazon.com/ses/latest/DeveloperGuide/request-production-access.html), +// you can only send email to other verified addresses in your account, or +// to addresses that are associated with the Amazon SES mailbox simulator +// (http://docs.aws.amazon.com/ses/latest/DeveloperGuide/mailbox-simulator.html). // -// * The message must include at least one recipient email address. The recipient -// address can be a To: address, a CC: address, or a BCC: address. If a recipient -// email address is invalid (that is, it is not in the format UserName@[SubDomain.]Domain.TopLevelDomain), -// the entire message will be rejected, even if the message contains other -// recipients that are valid. +// * The maximum message size, including attachments, is 10 MB. // -// * The message may not include more than 50 recipients, across the To:, -// CC: and BCC: fields. If you need to send an email message to a larger -// audience, you can divide your recipient list into groups of 50 or fewer, -// and then call the SendRawEmail operation several times to send the message -// to each group. +// * Each message has to include at least one recipient address. A recipient +// address includes any address on the To:, CC:, or BCC: lines. // -// For every message that you send, the total number of recipients (including -// each recipient in the To:, CC: and BCC: fields) is counted against the maximum -// number of emails you can send in a 24-hour period (your sending quota). For -// more information about sending quotas in Amazon SES, see Managing Your Amazon -// SES Sending Limits (http://docs.aws.amazon.com/ses/latest/DeveloperGuide/manage-sending-limits.html) -// in the Amazon SES Developer Guide. +// * If you send a single message to more than one recipient address, and +// one of the recipient addresses isn't in a valid format (that is, it's +// not in the format UserName@[SubDomain.]Domain.TopLevelDomain), Amazon +// SES rejects the entire message, even if the other addresses are valid. +// +// * Each message can include up to 50 recipient addresses across the To:, +// CC:, or BCC: lines. If you need to send a single message to more than +// 50 recipients, you have to split the list of recipient addresses into +// groups of less than 50 recipients, and send separate messages to each +// group. +// +// * Amazon SES allows you to specify 8-bit Content-Transfer-Encoding for +// MIME message parts. However, if Amazon SES has to modify the contents +// of your message (for example, if you use open and click tracking), 8-bit +// content isn't preserved. For this reason, we highly recommend that you +// encode all content that isn't 7-bit ASCII. For more information, see MIME +// Encoding (http://docs.aws.amazon.com/ses/latest/DeveloperGuide/send-email-raw.html#send-email-mime-encoding) +// in the Amazon SES Developer Guide. // // Additionally, keep the following considerations in mind when using the SendRawEmail // operation: @@ -4469,6 +4480,13 @@ func (c *SES) SendRawEmailRequest(input *SendRawEmailInput) (req *request.Reques // see the Using Sending Authorization with Amazon SES (http://docs.aws.amazon.com/ses/latest/DeveloperGuide/sending-authorization.html) // in the Amazon SES Developer Guide. // +// * For every message that you send, the total number of recipients (including +// each recipient in the To:, CC: and BCC: fields) is counted against the +// maximum number of emails you can send in a 24-hour period (your sending +// quota). For more information about sending quotas in Amazon SES, see Managing +// Your Amazon SES Sending Limits (http://docs.aws.amazon.com/ses/latest/DeveloperGuide/manage-sending-limits.html) +// in the Amazon SES Developer Guide. +// // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about // the error. @@ -4584,8 +4602,7 @@ func (c *SES) SendTemplatedEmailRequest(input *SendTemplatedEmailInput) (req *re // Email Addresses and Domains (http://docs.aws.amazon.com/ses/latest/DeveloperGuide/verify-addresses-and-domains.html) // in the Amazon SES Developer Guide. // -// * The total size of the message, including attachments, must be less than -// 10 MB. +// * The maximum message size is 10 MB. // // * Calls to the SendTemplatedEmail operation may only include one Destination // parameter. A destination is a set of recipients who will receive the same @@ -5138,13 +5155,12 @@ func (c *SES) SetIdentityNotificationTopicRequest(input *SetIdentityNotification // SetIdentityNotificationTopic API operation for Amazon Simple Email Service. // -// Given an identity (an email address or a domain), sets the Amazon Simple -// Notification Service (Amazon SNS) topic to which Amazon SES will publish -// bounce, complaint, and/or delivery notifications for emails sent with that -// identity as the Source. -// -// Unless feedback forwarding is enabled, you must specify Amazon SNS topics -// for bounce and complaint notifications. For more information, see SetIdentityFeedbackForwardingEnabled. +// Sets an Amazon Simple Notification Service (Amazon SNS) topic to use when +// delivering notifications. When you use this operation, you specify a verified +// identity, such as an email address or domain. When you send an email that +// uses the chosen identity in the Source field, Amazon SES sends notifications +// to the topic you specified. You can send bounce, complaint, or delivery notifications +// (or any combination of the three) to the Amazon SNS topic that you specify. // // You can execute this operation no more than once per second. // @@ -12751,18 +12767,26 @@ type SendRawEmailInput struct { // SendRawEmail in this guide, or see the Amazon SES Developer Guide (http://docs.aws.amazon.com/ses/latest/DeveloperGuide/sending-authorization-delegate-sender-tasks-email.html). FromArn *string `type:"string"` - // The raw text of the message. The client is responsible for ensuring the following: + // The raw email message itself. The message has to meet the following criteria: // - // * Message must contain a header and a body, separated by a blank line. + // * The message has to contain a header and a body, separated by a blank + // line. // - // * All required header fields must be present. + // * All of the required header fields must be present in the message. // // * Each part of a multipart MIME message must be formatted properly. // - // * MIME content types must be among those supported by Amazon SES. For - // more information, go to the Amazon SES Developer Guide (http://docs.aws.amazon.com/ses/latest/DeveloperGuide/mime-types.html). + // * Attachments must be of a content type that Amazon SES supports. For + // a list on unsupported content types, see Unsupported Attachment Types + // (http://docs.aws.amazon.com/ses/latest/DeveloperGuide/mime-types.html) + // in the Amazon SES Developer Guide. // - // * Must be base64-encoded. + // * The entire message must be base64-encoded. + // + // * If any of the MIME parts in your message contain content that is outside + // of the 7-bit ASCII character range, we highly recommend that you encode + // that content. For more information, see Sending Raw Email (http://docs.aws.amazon.com/ses/latest/DeveloperGuide/send-email-raw.html) + // in the Amazon SES Developer Guide. // // * Per RFC 5321 (https://tools.ietf.org/html/rfc5321#section-4.5.3.1.6), // the maximum length of each line of text, including the , must not @@ -13552,9 +13576,14 @@ func (s SetIdentityMailFromDomainOutput) GoString() string { type SetIdentityNotificationTopicInput struct { _ struct{} `type:"structure"` - // The identity for which the Amazon SNS topic will be set. You can specify - // an identity by using its name or by using its Amazon Resource Name (ARN). - // Examples: user@example.com, example.com, arn:aws:ses:us-east-1:123456789012:identity/example.com. + // The identity (email address or domain) that you want to set the Amazon SNS + // topic for. + // + // You can only specify a verified identity for this parameter. + // + // You can specify an identity by using its name or by using its Amazon Resource + // Name (ARN). The following examples are all valid identities: sender@example.com, + // example.com, arn:aws:ses:us-east-1:123456789012:identity/example.com. // // Identity is a required field Identity *string `type:"string" required:"true"` diff --git a/vendor/vendor.json b/vendor/vendor.json index ba5eaf61b90..35fb050359f 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -47,1020 +47,1020 @@ "versionExact": "v1.0.0" }, { - "checksumSHA1": "emeY6B3JPyd8nlWsaIWSEWqkJyQ=", + "checksumSHA1": "XcyqmeDKuYBMGIGlqCERSukh3I8=", "path": "github.com/aws/aws-sdk-go/aws", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "DtuTqKH29YnLjrIJkRYX0HQtXY0=", "path": "github.com/aws/aws-sdk-go/aws/arn", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "Y9W+4GimK4Fuxq+vyIskVYFRnX4=", "path": "github.com/aws/aws-sdk-go/aws/awserr", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "yyYr41HZ1Aq0hWc3J5ijXwYEcac=", "path": "github.com/aws/aws-sdk-go/aws/awsutil", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "EwL79Cq6euk+EV/t/n2E+jzPNmU=", "path": "github.com/aws/aws-sdk-go/aws/client", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "uEJU4I6dTKaraQKvrljlYKUZwoc=", "path": "github.com/aws/aws-sdk-go/aws/client/metadata", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "vVSUnICaD9IaBQisCfw0n8zLwig=", "path": "github.com/aws/aws-sdk-go/aws/corehandlers", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "I87y3G8r14yKZQ5NlkupFUJ5jW0=", "path": "github.com/aws/aws-sdk-go/aws/credentials", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "JTilCBYWVAfhbKSnrxCNhE8IFns=", "path": "github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "NUJUTWlc1sV8b7WjfiYc4JZbXl0=", "path": "github.com/aws/aws-sdk-go/aws/credentials/endpointcreds", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "JEYqmF83O5n5bHkupAzA6STm0no=", "path": "github.com/aws/aws-sdk-go/aws/credentials/stscreds", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "eI5TmiOTCFjEUNvWeceFycs9dRU=", "path": "github.com/aws/aws-sdk-go/aws/csm", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "6DRhqSAN7O45gYfRIpwDeuJE8j8=", "path": "github.com/aws/aws-sdk-go/aws/defaults", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "uPkjJo+J10vbEukYYXmf0w7Cn4Q=", "path": "github.com/aws/aws-sdk-go/aws/ec2metadata", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "dmNv2Zknjg9hMHc+Bu5/InkxdNI=", "path": "github.com/aws/aws-sdk-go/aws/endpoints", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "Ia/AZ2fZp7J4lMO6fpkvfLU/HGY=", "path": "github.com/aws/aws-sdk-go/aws/request", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "zx1mZCdOwgbjBV3jMfb0kyDd//Q=", "path": "github.com/aws/aws-sdk-go/aws/session", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "gQ1sGIVnPqvvxa9Ww2g/PGkk16M=", "path": "github.com/aws/aws-sdk-go/aws/signer/v4", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "wjxQlU1PYxrDRFoL1Vek8Wch7jk=", "path": "github.com/aws/aws-sdk-go/internal/sdkio", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "MYLldFRnsZh21TfCkgkXCT3maPU=", "path": "github.com/aws/aws-sdk-go/internal/sdkrand", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "tQVg7Sz2zv+KkhbiXxPH0mh9spg=", "path": "github.com/aws/aws-sdk-go/internal/sdkuri", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "04ypv4x12l4q0TksA1zEVsmgpvw=", "path": "github.com/aws/aws-sdk-go/internal/shareddefaults", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "ZX5QHZb0PrK4UF45um2kaAEiX+8=", "path": "github.com/aws/aws-sdk-go/private/protocol", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "0cZnOaE1EcFUuiu4bdHV2k7slQg=", "path": "github.com/aws/aws-sdk-go/private/protocol/ec2query", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "stsUCJVnZ5yMrmzSExbjbYp5tZ8=", "path": "github.com/aws/aws-sdk-go/private/protocol/eventstream", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "bOQjEfKXaTqe7dZhDDER/wZUzQc=", "path": "github.com/aws/aws-sdk-go/private/protocol/eventstream/eventstreamapi", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "tXRIRarT7qepHconxydtO7mXod4=", "path": "github.com/aws/aws-sdk-go/private/protocol/json/jsonutil", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "M/NMrlQ2oULxgqzCvOfA30NN+Hc=", "path": "github.com/aws/aws-sdk-go/private/protocol/jsonrpc", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "lj56XJFI2OSp+hEOrFZ+eiEi/yM=", "path": "github.com/aws/aws-sdk-go/private/protocol/query", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "+O6A945eTP9plLpkEMZB0lwBAcg=", "path": "github.com/aws/aws-sdk-go/private/protocol/query/queryutil", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "uRvmEPKcEdv7qc0Ep2zn0E3Xumc=", "path": "github.com/aws/aws-sdk-go/private/protocol/rest", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "OGjEnXhjob/5yfMcW8JHD9NeczY=", "path": "github.com/aws/aws-sdk-go/private/protocol/restjson", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "ZZgzuZoMphxAf8wwz9QqpSQdBGc=", "path": "github.com/aws/aws-sdk-go/private/protocol/restxml", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "soXVJWQ/xvEB72Mo6FresaQIxLg=", "path": "github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "F6mth+G7dXN1GI+nktaGo8Lx8aE=", "path": "github.com/aws/aws-sdk-go/private/signer/v2", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "4xFqSOZkwDKot6FJQQgKjhJFoQw=", "path": "github.com/aws/aws-sdk-go/service/acm", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "3e/4A/8NqTOSXEtJ6KhYAqqWnuY=", "path": "github.com/aws/aws-sdk-go/service/acmpca", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "gnra20TFPzmLbXjGvNyd1I8MP+A=", "path": "github.com/aws/aws-sdk-go/service/apigateway", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "K/ynSj/L2OzW+9Zqs2PRe8NzYUc=", "path": "github.com/aws/aws-sdk-go/service/applicationautoscaling", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "owhfVKeKxjXt4P5KO6PSIjnMLIA=", "path": "github.com/aws/aws-sdk-go/service/appsync", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "3JN52M5wxJMazxQWXB4epL78LNQ=", "path": "github.com/aws/aws-sdk-go/service/athena", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "P2+Mby00TG2KXcfhiVoNoqIT1Kc=", "path": "github.com/aws/aws-sdk-go/service/autoscaling", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "42OCpXRErVgOtgPsuTrdg7y++TA=", "path": "github.com/aws/aws-sdk-go/service/batch", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "kPYTVg109H4HL8CKEf1yQvwKMw4=", "path": "github.com/aws/aws-sdk-go/service/budgets", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "GhANcrglYWrhNSR/NzxNe3jClMk=", "path": "github.com/aws/aws-sdk-go/service/cloud9", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "HmZRIixQ6u+zMz2Qt0iTU42WVZU=", "path": "github.com/aws/aws-sdk-go/service/cloudformation", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "vji1m2m9ubDFRcv7UuDcD/CBjTc=", "path": "github.com/aws/aws-sdk-go/service/cloudfront", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "H5MA8wWENhj36kHuNzegai4auhg=", "path": "github.com/aws/aws-sdk-go/service/cloudhsmv2", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "1uyTJ/RTr7c8uL2Kbrp+60PE40M=", "path": "github.com/aws/aws-sdk-go/service/cloudsearch", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "XTJxEnVVUOosPxVNHYHpkJ7Cexo=", "path": "github.com/aws/aws-sdk-go/service/cloudtrail", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { - "checksumSHA1": "o+DFxugR5Cy/Wwlv7GSRRilTW4o=", + "checksumSHA1": "kwJggEX9qSkmOwfXZxrx/7PzsGI=", "path": "github.com/aws/aws-sdk-go/service/cloudwatch", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "bbsROEsQ5BI5F2k8qiArbrpgH94=", "path": "github.com/aws/aws-sdk-go/service/cloudwatchevents", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "UyVuwts5ZE8rw9jGeubOLvvQaI8=", "path": "github.com/aws/aws-sdk-go/service/cloudwatchlogs", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { - "checksumSHA1": "D3p9zRPfvqPBDBVGCCVG2wgYh38=", + "checksumSHA1": "93JBs0oX/wyisR/XRcNx0H8tvVQ=", "path": "github.com/aws/aws-sdk-go/service/codebuild", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "rvZxiKvno7mVcW7tS+rcF6mDWsY=", "path": "github.com/aws/aws-sdk-go/service/codecommit", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "GvjVVg5btXuEFEHqyoe19BZogGw=", "path": "github.com/aws/aws-sdk-go/service/codedeploy", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "vklitYIK0AiOXA0obSTq0c04pc4=", "path": "github.com/aws/aws-sdk-go/service/codepipeline", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "rL0O6L1zSJ/UQE0kEWUoCOOFDog=", "path": "github.com/aws/aws-sdk-go/service/cognitoidentity", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "gkmRw2ZP/uU+V3b9v7CQM0CA0xs=", "path": "github.com/aws/aws-sdk-go/service/cognitoidentityprovider", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "ZKsjHOyH5z0PuKFcNtwlbhxwHFg=", "path": "github.com/aws/aws-sdk-go/service/configservice", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "RmFFvwnIx0l3buDtcoQ3PWkW7+g=", "path": "github.com/aws/aws-sdk-go/service/databasemigrationservice", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "TWva9VAs3zgU/FQjJkiUvY3wIXw=", "path": "github.com/aws/aws-sdk-go/service/dax", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "LfJ0Owy9HyaulKTvDEgCdkChMG8=", "path": "github.com/aws/aws-sdk-go/service/devicefarm", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "zblSxBuyR1S5z7oSouEdCXoCUuE=", "path": "github.com/aws/aws-sdk-go/service/directconnect", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "a02+OXxnVBBBeaZpgs8dXUHj8b0=", "path": "github.com/aws/aws-sdk-go/service/directoryservice", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "xoFqND2spsYdyoui+wKepfGQS8c=", "path": "github.com/aws/aws-sdk-go/service/dlm", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "42xYT0wxX/R9vu4C9+cHtBZkvxY=", "path": "github.com/aws/aws-sdk-go/service/dynamodb", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { - "checksumSHA1": "QutiSGcdlnEisOq+KNZ872PAl7I=", + "checksumSHA1": "XETyoq3ygccqWENGHACpGps+p7o=", "path": "github.com/aws/aws-sdk-go/service/ec2", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "VD7bAh0n/UgOwRBPe5y38Ow/dHU=", "path": "github.com/aws/aws-sdk-go/service/ecr", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { - "checksumSHA1": "Q8RuvleYpFO1hlm/eKRbg5wG/nQ=", + "checksumSHA1": "1oG37V7l0otp9pqbyWXcPJv3O/8=", "path": "github.com/aws/aws-sdk-go/service/ecs", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "NDrEwIZeUSlHgENwBzVdy0KcCCY=", "path": "github.com/aws/aws-sdk-go/service/efs", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "dSndJIyIFwpciskUn2ZmUvIdR+c=", "path": "github.com/aws/aws-sdk-go/service/eks", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { - "checksumSHA1": "kvsll2DfqS1hg97xSWMIcMan5as=", + "checksumSHA1": "lILFc3A1a60Sv2sbdmqmp+YyK1A=", "path": "github.com/aws/aws-sdk-go/service/elasticache", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "G1BmSThB0eTjq8gSfjA+PnB9zs0=", "path": "github.com/aws/aws-sdk-go/service/elasticbeanstalk", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { - "checksumSHA1": "O++z0DZj/MzSNWgVfV+SYzTS/fM=", + "checksumSHA1": "V6KcC3YquAo1VcT4OoEX/QQyFUA=", "path": "github.com/aws/aws-sdk-go/service/elasticsearchservice", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { - "checksumSHA1": "qyRoP+xRrXcGnnUu78L8hv9Qar8=", + "checksumSHA1": "k5QQzIkQYnAOnRYLcZwHAOyXCtQ=", "path": "github.com/aws/aws-sdk-go/service/elastictranscoder", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "SnJVGrH1gX3X7pfugBZ5dWhQM6E=", "path": "github.com/aws/aws-sdk-go/service/elb", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "wIiqI9GFAV2AQ32o2kEYHNyqVig=", "path": "github.com/aws/aws-sdk-go/service/elbv2", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "7cq3bZMJV152e3ocGW8mbI657J0=", "path": "github.com/aws/aws-sdk-go/service/emr", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "VO+EdD/iXQVzjiuIeCQhVAsm9SI=", "path": "github.com/aws/aws-sdk-go/service/firehose", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { - "checksumSHA1": "tNVmAgvnURWLWibVCL7vIDYU7UM=", + "checksumSHA1": "2/b8QVWYIBGbDNK9nYVLcRo9hRg=", "path": "github.com/aws/aws-sdk-go/service/fms", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "J1SHh0J6kX8JBD0+TQCFP+1Kij4=", "path": "github.com/aws/aws-sdk-go/service/gamelift", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "BB3/VzUU5Rg4KgrezJ17D4kCnwA=", "path": "github.com/aws/aws-sdk-go/service/glacier", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "A1E5569KvbsmoB9/eA0YxBYmjMI=", "path": "github.com/aws/aws-sdk-go/service/glue", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "HNndTio5+fNOiLr23i+QZpPp8HU=", "path": "github.com/aws/aws-sdk-go/service/guardduty", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "ae+jhUirSvN0IXPVU7X7xc+EbFE=", "path": "github.com/aws/aws-sdk-go/service/iam", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "39yMWxFP9XB+8wWWCZX4vkNWmxU=", "path": "github.com/aws/aws-sdk-go/service/inspector", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "wAWGvZ95XguL4gT8AEYNtum2eZM=", "path": "github.com/aws/aws-sdk-go/service/iot", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "q9HZ/0/lBSRKtjHXMegmcRcazPo=", "path": "github.com/aws/aws-sdk-go/service/kinesis", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "nUdxsOW9jg+m+sWZYPu7oX9rZo8=", "path": "github.com/aws/aws-sdk-go/service/kinesisanalytics", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "vaMnUnRVDkpHp/e4f3dFX20JblM=", "path": "github.com/aws/aws-sdk-go/service/kms", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "5dqI6y+bI5brPj7ReZT/NJSGzrM=", "path": "github.com/aws/aws-sdk-go/service/lambda", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "nMklVJilxMmhlmnnquFJB97isMk=", "path": "github.com/aws/aws-sdk-go/service/lexmodelbuildingservice", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "ROCCysE4/I6Tu5OCs6fuc0uTXBo=", "path": "github.com/aws/aws-sdk-go/service/lightsail", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "+l6bA5aVzmBXH2Isj1xZkd5RKNY=", "path": "github.com/aws/aws-sdk-go/service/macie", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "yLEEM14iEZqEH3C7ieCw+puIjiU=", "path": "github.com/aws/aws-sdk-go/service/mediaconvert", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "PE3129yEUwSvn0rg3P86Pxqnnps=", "path": "github.com/aws/aws-sdk-go/service/medialive", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "7/SSsXiRqnukDTUDeEg1ToMD6nQ=", "path": "github.com/aws/aws-sdk-go/service/mediapackage", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "9NU6dJOvKvcgnl/4eUdwy4YD5ss=", "path": "github.com/aws/aws-sdk-go/service/mediastore", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "qyIVtaN5mzPq4d7BDj9YpYtifKs=", "path": "github.com/aws/aws-sdk-go/service/mediastoredata", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "1jKxCBvS+zKzq6p2i4BqLXYHm48=", "path": "github.com/aws/aws-sdk-go/service/mq", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "44C523Sshu3BkoWwmXxawrUF2LQ=", "path": "github.com/aws/aws-sdk-go/service/neptune", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "x3PsW91a7fh+Q466y3WM3fdtnGg=", "path": "github.com/aws/aws-sdk-go/service/opsworks", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { - "checksumSHA1": "YCd2EU1DPiO0QTRZk6G1fLZAyg0=", + "checksumSHA1": "fwGuLMKZjqpwaxsDvIiZUwWtYhM=", "path": "github.com/aws/aws-sdk-go/service/organizations", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "e5v4Cc9/0H2ngQNuvVyj2Mt0vi0=", "path": "github.com/aws/aws-sdk-go/service/pinpoint", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "j1i1tZ94/kDvvzgpv5xqxwNvgyY=", "path": "github.com/aws/aws-sdk-go/service/pricing", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "vQ0oeZ+9gR8zIbkYMEA87D/vAas=", "path": "github.com/aws/aws-sdk-go/service/rds", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "QocMd7m30oMSTWvEWoqytggtMno=", "path": "github.com/aws/aws-sdk-go/service/redshift", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "KlM6azZ5G09MmPg+lzEizW2qaLA=", "path": "github.com/aws/aws-sdk-go/service/route53", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { - "checksumSHA1": "u5BxHJjA59ZgfZYvR5aJgWAthM8=", + "checksumSHA1": "nJE/Ts7KsiIwdDK4SLlZhGeGbLQ=", "path": "github.com/aws/aws-sdk-go/service/s3", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "qB34t8+gQAYbx7kaxDIllgM9MpQ=", "path": "github.com/aws/aws-sdk-go/service/sagemaker", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { - "checksumSHA1": "FkBALtXiN4PCzFnl/G2gXFFLV3E=", + "checksumSHA1": "TDOmiGJj5vg5aCwjTNCa6FAR27M=", "path": "github.com/aws/aws-sdk-go/service/secretsmanager", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "Y29bmjwKXcPg0d0WvZNFGdhd4+E=", "path": "github.com/aws/aws-sdk-go/service/serverlessapplicationrepository", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "T8dOJ1jjEBdogUE03oRPRJCOY3k=", "path": "github.com/aws/aws-sdk-go/service/servicecatalog", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "UhJ0RdPXzdMOUEBWREB5Zi9lgmY=", "path": "github.com/aws/aws-sdk-go/service/servicediscovery", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { - "checksumSHA1": "0vtFXRYnhlCCq8/zPv1O1YWIoSg=", + "checksumSHA1": "n8Omv6QJc5ONFl/rJwFhEeBL4YQ=", "path": "github.com/aws/aws-sdk-go/service/ses", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "1rJbvLXRsCzWhTihruRq/i0Zawg=", "path": "github.com/aws/aws-sdk-go/service/sfn", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "hliWYTmov/HswyMpYq93zJtdkk0=", "path": "github.com/aws/aws-sdk-go/service/simpledb", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "bW9FW0Qe3VURaSoY305kA/wCFrM=", "path": "github.com/aws/aws-sdk-go/service/sns", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "ECIZck5xhocpUl8GeUAdeSnCgvg=", "path": "github.com/aws/aws-sdk-go/service/sqs", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "WmzUmkGbfT3M2Cck71AbSn4DlX8=", "path": "github.com/aws/aws-sdk-go/service/ssm", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "TeuakooizAybzyMQyTXllUyhfBg=", "path": "github.com/aws/aws-sdk-go/service/storagegateway", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "UhIVLDgQc19wjrPj8pP7Fu2UwWc=", "path": "github.com/aws/aws-sdk-go/service/sts", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "zSqEhiGtEK6ll3f1Rlf2tuDKQA8=", "path": "github.com/aws/aws-sdk-go/service/swf", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "N/w20GqQBU7sVFbshxOA3AWAvDU=", "path": "github.com/aws/aws-sdk-go/service/waf", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "ocF/2t8BOrkUpc62h6kHH0WtfTg=", "path": "github.com/aws/aws-sdk-go/service/wafregional", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "oe8l2ibuhzz7fWM3f64cWnHwFy8=", "path": "github.com/aws/aws-sdk-go/service/workspaces", - "revision": "1186f7e6f000ce13edff71ed5ecc8b0e27ba38d7", - "revisionTime": "2018-09-11T19:37:41Z", - "version": "v1.15.33", - "versionExact": "v1.15.33" + "revision": "949f7800d745d1df9af349380e5deec8de206144", + "revisionTime": "2018-09-19T19:26:01Z", + "version": "v1.15.38", + "versionExact": "v1.15.38" }, { "checksumSHA1": "yBBHqv7DvZNsZdF00SO8PbEQAKU=", From 486a75ed6ca564dd48cdc9407df9c41603299bfc Mon Sep 17 00:00:00 2001 From: Guimove Date: Thu, 20 Sep 2018 11:54:25 +0200 Subject: [PATCH 182/184] correct fmt --- aws/data_source_aws_autoscaling_groups.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws/data_source_aws_autoscaling_groups.go b/aws/data_source_aws_autoscaling_groups.go index cf5e741251c..a3b8bb709fd 100644 --- a/aws/data_source_aws_autoscaling_groups.go +++ b/aws/data_source_aws_autoscaling_groups.go @@ -106,7 +106,7 @@ func dataSourceAwsAutoscalingGroupsRead(d *schema.ResourceData, meta interface{} sort.Strings(rawName) sort.Strings(rawArn) - if err := d.Set("names", rawName); err != nil { + if err := d.Set("names", rawName); err != nil { return fmt.Errorf("[WARN] Error setting Autoscaling Group Names: %s", err) } From c5d95f1a2d426f6aa4e35cb02936e15e1ae702e3 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Thu, 20 Sep 2018 09:33:56 -0400 Subject: [PATCH 183/184] Update CHANGELOG for #5766 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c80aabce1a..97c55343e9d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ENHANCEMENTS: +* data-source/aws_autoscaling_groups: Add `arns` attribute [GH-5766] * resource/aws_launch_template: Support `credit_specification` configuration of T3 instance types [GH-5922] ## 1.37.0 (September 19, 2018) From 39dcb45d3b6e25e330362d4efb1baa655004073e Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Thu, 20 Sep 2018 09:46:32 -0400 Subject: [PATCH 184/184] Update CHANGELOG for #5939 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 97c55343e9d..7e69e425688 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ENHANCEMENTS: * data-source/aws_autoscaling_groups: Add `arns` attribute [GH-5766] +* resource/aws_codebuild_project: Add `secondary_artifacts` and `secondary_sources` arguments [GH-5939] * resource/aws_launch_template: Support `credit_specification` configuration of T3 instance types [GH-5922] ## 1.37.0 (September 19, 2018)